406 Commits

Author SHA1 Message Date
Jaime van Kessel
afe5f56862 If a default color is used, the layer view now correctly uses it. 2017-07-17 11:44:54 +02:00
Ghostkeeper
6cac15de7d
Use default parameter to obtain default colour
There is a built-in mechanism for this, so we don't need to do this ourselves.
2017-07-06 09:48:36 +02:00
Ghostkeeper
bb68f488db
Make material finding more robust
The .findContainer technique is obsolete since we now just have a field for this.

Hopefully contributes to issue #2053.
2017-07-06 09:41:28 +02:00
Ghostkeeper
71c146f437
Always send not-printed objects to slicer regardless of build volume
Objects that aren't printed, such as infill meshes, can simply be sent to the slicer regardless of whether they are inside or outside the build volume, because they don't generate g-code in their own volume. This way you can have a model that is partially outside the build volume that still does its anti-overhang task or whatever.

Contributes to issue CURA-3951.
2017-06-30 13:04:09 +02:00
Ghostkeeper
cd4bffb380
Set author to Ultimaker B.V. instead of Ultimaker
To be consistent with the rest of the plug-ins and with the material files.

Contributes to issue CURA-3857.
2017-06-28 13:50:37 +02:00
Lipu Fei
fe5466872f Merge remote-tracking branch 'upstream/2.6' 2017-06-26 12:59:25 +02:00
Lipu Fei
bc65cc1102 Fix code style
CURA-3930
2017-06-26 12:49:34 +02:00
Tim Kuipers
fad78c20b5 fix: copy global settings into extruder msessage for SE (CURA-3930) 2017-06-22 14:40:12 +02:00
Lipu Fei
6be76ec806 Fix code style
CURA-3872
2017-06-22 14:00:04 +02:00
Jaime van Kessel
14fb01ee46 Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-22 10:24:36 +02:00
Lipu Fei
73f598ff9f Fix code style
CURA-3712
2017-06-22 08:54:04 +02:00
fieldOfView
de01155630 Add documentation 2017-06-21 19:15:05 +02:00
fieldOfView
adc547fa36 Don't send extruder stack settings to CuraEngine when there is just one extruder
When there is 1 extruder, the frontend stores all settings in the global stack. Sending an extruder stack confuses CuraEngine into using the values of the extruder stack, which results in defaults being used.
2017-06-21 19:00:18 +02:00
Jaime van Kessel
e3629cec39 Replaced catalog metadata entry with i18n-catalog
CURA-3712 & Cura-3856
2017-06-21 14:24:00 +02:00
Jaime van Kessel
44125d3275 Moved certain meta data entries to seperate file
CURA-3856 & CURA-3712
2017-06-21 11:22:35 +02:00
Ghostkeeper
ce6814d45d Add default for colour code of material
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
2017-05-24 15:20:59 +02:00
Jaime van Kessel
e6f61f3bbc When trying to convert None to RGBA, log it and return a usable default
contributes to #1869
2017-05-24 11:38:38 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature 2017-05-11 09:53:50 +02:00
Ghostkeeper
a9813146c4
Evaluate global stack first
The global stack has 99% of all settings. So most of the times the setting definition we are looking for is here. This should make it a bit faster to find.

Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
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