637 Commits

Author SHA1 Message Date
Ghostkeeper
281a01dd1f
Remove unused variable
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
Ghostkeeper
2137c30bd6
Also check extruders for definitions of error settings
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
Ghostkeeper
e19d5411c2
Expand log message when getting no definition when listing error settings
So that someone reading the log gets a clue where the error message occurs and why.

Contributes to issue CURA-3772.
2017-05-08 11:17:37 +02:00
Jaime van Kessel
63eceda75e Added handling for if definition for error handling was not found
CURA-3772
2017-05-08 10:28:31 +02:00
14bitVoid
f15aa66751 Receive time estimates per feature 2017-05-05 00:05:17 +02:00
Ghostkeeper
81ea9556eb
Fix showing layer view if there is no material
The layer view would request the colour of the material. If there is no material, that would give an error.

Contributes to issue CURA-3497.
2017-05-04 17:56:57 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack 2017-05-03 15:21:01 +02:00
Ghostkeeper
745e3cd5bf
Merge branch 'alephobjects-gcode-keywords' 2017-05-02 14:57:22 +02:00
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Ghostkeeper
f612a53563
Detect more temperature settings in start g-code
Other settings such as the layer 0 temperatures are now also properly detected.
2017-05-02 09:52:38 +02:00
Victor Larchenko
4f446bfcbc Added filament cost keyword replacement 2017-04-27 16:44:43 +06:00
Victor Larchenko
e47ca7a68d Merge remote-tracking branch 'um/master' into gcode-keywords 2017-04-21 14:36:22 +06:00
Arjen Hiemstra
df25fa9345 Do not try to handle resolve manually in StartSliceJob
Since the container stacks should now take care of it
2017-04-06 17:50:43 +02:00
Jack Ha
1a01d1b193 Change permissions back to 644 2017-04-05 10:19:12 +02:00
Jack Ha
2d6df1ae4a Fix workspacedialog booboo typo. 2017-04-05 10:18:36 +02:00
Jack Ha
1029fb4ddd Not to trigger reslice happy anymore, only retrigger if necessary. Also using isSliceable instead of property check when inspecting root node. CURA-3413 CURA-3412 2017-03-02 16:38:31 +01:00
U-ULTIMAKER\j.ha
c54d5ce707 Fixed compatibility mode active extruder. CURA-3321 2017-03-02 13:15:29 +01:00
Jack Ha
8a8b97d371 CuraEngineBackend now properly postpones onSceneChanged instead of ignoring some. CURA-3413 2017-03-01 11:45:50 +01:00
Jack Ha
0eec48b9e3 Fix reslice when deleting nodes, fix moving groups. CURA-3412 2017-03-01 10:53:53 +01:00
Jack Ha
bb955ca5ab Tickle the backend if per object settings are changed. CURA-3273 2017-02-21 16:12:25 +01:00
Jack Ha
057dc2fd7d Solved merge conflicts. CURA-3214 2017-02-21 11:01:20 +01:00
Jack Ha
5a76c92dda Small improvements: rename, log message, QObject parent, return value. CURA-3214 2017-02-21 10:52:56 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Jack Ha
74ce600978 Comments and removed logs. CURA-3214 2017-02-16 15:23:31 +01:00
Jack Ha
600a5d85e4 Added comments, changed text of NotStarted. CURA-3214 2017-02-16 15:07:26 +01:00
Jack Ha
18318348b6 Fixed last bugs in manual slicing. CURA-3214 2017-02-16 14:44:45 +01:00
Jack Ha
464bf73f85 Made backend available in qml, calling forceSlice and stopSlicing directly. CURA-3214 2017-02-16 10:56:01 +01:00
Jack Ha
db984561e9 Almost done with manual and auto slicing. CURA-3214 2017-02-15 16:02:14 +01:00
Jack Ha
94badb1b9f Fix auto slice after startup. CURA-3214 2017-02-15 13:51:24 +01:00
Jack Ha
ca84fdd767 Merge branch 'master' into feature_auto_slice 2017-02-15 12:42:09 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Jaime van Kessel
fce9df756c Fixed pause slicing not working when moving an object
CURA-3361
2017-02-10 11:43:38 +01:00
Jack Ha
3d1e5a84fc Added PauseBackendPlugin, added to changelog. CURA-3361 2017-02-09 17:19:59 +01:00
Jack Ha
c2bf88751e Enable functions pauseSlicing and continueSlicing in combination with BlockSlicingDecorator. CURA-3361 2017-02-09 16:06:36 +01:00
Jack Ha
47ab49795f Added comments, changed small layout and id thing. CURA-3273 2017-02-08 11:48:00 +01:00
Jack Ha
50ba236e66 Removed unused option in LayerPolygon, added comments 2017-02-08 11:24:41 +01:00
Jack Ha
1d6ef4bc3c Default color if no material color is available. CURA-3273 2017-02-08 10:40:17 +01:00
Jack Ha
ed1fea2d3e Fix colors of compatibility mode. CURA-3273 2017-02-07 13:20:26 +01:00
Victor Larchenko
7c3728632f T576: Added {jobname} keyword 2017-02-02 15:29:14 +06:00
Victor Larchenko
67aae55640 T576: Added print statistics 2017-02-02 15:28:57 +06:00
Victor Larchenko
dbb971fef5 T576: Added date and time keywords 2017-02-02 15:24:33 +06:00
Victor Larchenko
7adc1f4870 T576: Added aliases 2017-02-02 15:24:15 +06:00
Jack Ha
a52cb2fa63 Compatibility mode scale line type colors 2017-01-25 09:48:36 +01:00
Jack Ha
abe7a8e9a3 Merge branch 'master' into layer_view3_cleanup 2017-01-17 15:16:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
awhiemstra
47be957f38 Merge pull request #1267 from alephobjects/GCODEReader_upstream
Add a Gcode reader plugin
2017-01-11 17:15:52 +01:00
Jack Ha
e57de296e7 Readded accidently removed stuff 2017-01-03 10:14:34 +01:00
Jack Ha
55dd08eff8 Somewhat better layout, added legend 2017-01-03 09:18:26 +01:00