GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,072 Commits 290 Branches 260 Tags
Commit Graph

455 Commits

Author SHA1 Message Date
Jaime van Kessel
ede0cbcfe6 Removed old code in per object settings that caused crash. 2016-02-04 16:04:52 +01:00
Ghostkeeper
a334e8876d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-04 12:59:29 +01:00
Ghostkeeper
736d04ba8d Fix getting container properties 
Due to an optimisation earlier, the model and selected index in the per-object settings panel couldn't be found. This was giving errors and making the per-object settings unusable.

Contributes to issue CURA-458.
 2016-02-04 12:33:39 +01:00
Jaime van Kessel
01ecd9357c Max size & value are now set in correct order for layerview 
CURA-763
 2016-02-04 12:14:59 +01:00
Ghostkeeper
a658140997 Remove more remnants of print sequence message 
I found this other place that was helping to display the message that warns that print sequcence is set per-object. Since the latter is no longer possible, this message shouldn't be displayed any more.

Contributes to issue CURA-458.
 2016-02-04 12:14:59 +01:00
Ghostkeeper
44872ade43 Remove superfluous warning for printsequence 
Print sequence can no longer be chosen per-object, so the warning that displays when you choose print sequence per-object is no longer necessary.

Contributes to issue CURA-458.
 2016-02-04 12:08:57 +01:00
Ghostkeeper
bf03d71427 Hide setting if global-only 
In the per-object-setting panel, a setting is no longer displayed as settable per-object if it is global-only.

Contributes to issue CURA-458.
 2016-02-04 11:43:43 +01:00
Jaime van Kessel
eab378252a Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-03 10:27:27 +01:00
Jaime van Kessel
e7ab686318 Increases size of imageload dialog 
CURA-266
 2016-02-03 10:26:52 +01:00
Jaime van Kessel
538ef391c7 Removes undefined modal type 
CURA-266
 2016-02-03 10:25:25 +01:00
Jaime van Kessel
0038408933 Fixes binding errors 
CURA-266
 2016-02-03 10:24:52 +01:00
Jaime van Kessel
88f9cbc213 Fixes several code style violations 2016-02-03 09:14:34 +01:00
Arjen Hiemstra
1e4631ecdd Remove Cura_pb2.py file since it is no longer needed 
The new Arcus API uses the Cura.proto file instead.
 2016-02-02 18:22:09 +01:00
Jaime van Kessel
7c744044fd Fixed merge issues & updated proto files 2016-02-02 11:25:10 +01:00
Arjen Hiemstra
ffec2484b7 Fix Layer view 2016-02-01 17:15:45 +01:00
Jaime van Kessel
d68e17c9f5 Merge pull request #624 from Ultimaker/fast_advanced_switch 
Fast Simple<->Advanced Switch
 2016-02-01 10:48:27 +01:00
Ghostkeeper
a45e55ab4c Reactivate _always_restart 
This was deactivated during debugging as a test. Shouldn't have been committed.

Contributes to issue CURA-427.
 2016-01-29 20:57:16 +01:00
Arjen Hiemstra
5d136a1da7 ActiveTool.properties now returns a ContainerProxy object 2016-01-29 15:18:19 +01:00
Ghostkeeper
c53969f1bd Wait for FinishedSlicing message to mark slicing as finished 
Instead of waiting until progress is more than 99%, wait for the dedicated FinishedSlicing message.

Contributes to issue CURA-427.
 2016-01-29 11:22:04 +01:00
Arjen Hiemstra
e74d300fb3 Make things work properly using the new Arcus API 2016-01-28 18:07:42 +01:00
Arjen Hiemstra
21f70c4123 Add Cura protobuf protocol file 
Should find some way of sharing the one in CuraEngine but this works for
now
 2016-01-28 03:23:47 +01:00
Arjen Hiemstra
22fb26bae6 Update StartSliceJob to reflect the new Arcus API 2016-01-28 03:23:10 +01:00
Arjen Hiemstra
6930008dd8 Pass the protocol file to Backend's createSocket 2016-01-28 03:22:18 +01:00
Ghostkeeper
f09b927288 Add check if resulting profile is empty 
If it is, a warning is logged.

Contributes to issue CURA-37.
 2016-01-26 13:58:00 +01:00
Ghostkeeper
e7b2586d36 Don't add to profile if setting is legacy default 
If a setting is equal to the legacy setting's default value, then it doesn't get added to the profile either.

Contributes to issue CURA-37.
 2016-01-26 13:50:46 +01:00
Ghostkeeper
c0b5832a59 Remove debug prints 
Shouldn't have committed those. Sorry!

Contributes to issue CURA-37.
 2016-01-26 13:32:52 +01:00
Ghostkeeper
5374d253e9 Evaluate to old defaults if setting is missing 
If the setting is missing from the legacy profile, let it evaluate to the default in the legacy Cura.

Contributes to issue CURA-37.
 2016-01-26 13:27:42 +01:00
Jaime van Kessel
5e5bcfb5fd Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-22 16:54:23 +01:00
Ghostkeeper
67c82204ba Fix codestyle issues 
They were introduced by b28bfc9602

Contributes to issue CURA-266.
 2016-01-22 16:41:07 +01:00
Jaime van Kessel
0b920950d4 Layer processing is now only done when no slicing is occuring. 
Contributes to CURA-693
 2016-01-22 16:38:03 +01:00
Jaime van Kessel
ffa87a9302 Fixed issue that caused crash when renaming printer 
CURA-670
 2016-01-22 12:25:22 +01:00
Tim Kuipers
261e8d9b08 updated protobuff generated files to include SlicingFinished msg (CURA-427) 2016-01-22 10:58:24 +01:00
Ghostkeeper
fbd5471f5b Set machine_nozzle_size when importing legacy profile 
Machine_nozzle_size was just a machine setting when this dictionary of doom was made.

Contributes to issue CURA-37.
 2016-01-21 15:01:50 +01:00
Ghostkeeper
0d16fdf3ba Use a uniform-color shader for selection 
In layer view, the selection shader is now a uniform-color shader. This shader does not use the vertex colours but makes the entire silhouette the same colour.

Contributes to issue CURA-625.
 2016-01-21 14:24:57 +01:00
Ghostkeeper
e23a9ea997 Move the changing of the setting after import out of try-except 
It should never give an exception, so if it does, crash and burn the application.

Contributes to issue CURA-37.
 2016-01-20 14:42:32 +01:00
Ghostkeeper
edc2b2c7e2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-18 17:36:59 +01:00
Ghostkeeper
bc0207cd14 Add invisible preference for file type of output 
This preference can't be made visible since a string freeze is into effect, but at least a user could go into the .cfg file and set the setting manually.

Contributes to issue CURA-611.
 2016-01-18 17:36:41 +01:00
Tamara Hogenhout
c48051e39d marked the string as translatable 
Contributes to #CURA-526
 2016-01-18 12:19:59 +01:00
Ghostkeeper
136eb65105 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-17 14:42:27 +01:00
Ghostkeeper
0e8cc11676 Update protobuf file 
Cura's protobuf-generated file was out of sync with CuraEngine, resulting in socket errors.

Contributes to issue CURA-605.
 2016-01-17 14:35:06 +01:00
Kurt Loeffler
44217fbf94 Changed the translation string context in the ComboBox items in the image import dialog to their correct value of "@item:inlistbox". 2016-01-15 09:55:10 -08:00
Ghostkeeper
8dc6353738 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-14 11:54:02 +01:00
Ghostkeeper
db2af1fa0d Fix line width 
The Expression of Doom is put into the Dictionary of Doom!

Contributes to issue CURA-37.
 2016-01-14 11:53:32 +01:00
Kurt Loeffler
b28bfc9602 Reworked UI so that it matches 15.04 UI, and made each field in the UI do the same thing that they do in 15.04. 2016-01-13 20:08:42 -08:00
Arjen Hiemstra
b8cf51349c Add an AutoSave plugin that autosaves preferences, instances and profiles 
Currently using a 1 minute timer, so we do not constantly trigger a save
when editing profiles.

Contributes to CURA-511
 2016-01-13 23:12:56 +01:00
Ghostkeeper
ac1ada87e6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-01-13 17:05:25 +01:00
Ghostkeeper
e82988f5e4 Correctly parse legacy speed settings with strange floats 
If the legacy profile contains float values serialised to '0.0' or '0.00' instead of just '0', this now works correctly instead of evaluating the string comparison to false.

Contributes to issue CURA-37.
 2016-01-13 17:04:28 +01:00
Ghostkeeper
9feb609fba Don't add a setting if evaluation failed 
If the eval failed that is likely caused by a variable not existing. It now continues with evaluating other settings and just doesn't add the setting that depends on non-existing legacy settings. This happens when the imported profile is not complete or corrupt.

Contributes to issue CURA-37.
 2016-01-13 16:59:05 +01:00
Ghostkeeper
7f1a746a45 Make infill_before_walls opposite 
The perimeter_before_infill setting was opposite of infill_before_walls, so turn this boolean around.

Contributes to issue CURA-37.
 2016-01-13 16:33:39 +01:00
Ghostkeeper
a4777ac2ed Correct wall thickness setting 
The shell thickness also governs the top_bottom_thickness, which is not desired.

Contributes to issue CURA-37.
 2016-01-13 16:32:38 +01:00