Commit graph

6967 commits

Author SHA1 Message Date
Jaime van Kessel
ddd4a46e76 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 12:42:21 +02:00
Jaime van Kessel
75c788c31a Moved check for top container setting function up in the code
Should improve performance a bit. CURA-2361
2016-09-19 12:40:05 +02:00
Jaime van Kessel
642b6b1ca3 Updated documentation
CURA-2361
2016-09-19 12:37:13 +02:00
Ghostkeeper
fd181ca0c3
Fix display of extruder values for enums
It wasn't always a list of ints. For enums, it's a list of strings. We have several other types. Just use variant.

Contributes to issue CURA-2232.
2016-09-16 15:56:22 +02:00
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate
CURA-2361
2016-09-16 15:32:16 +02:00
Jaime van Kessel
6d2520ffbb _settingIsOverwritingInheritance now also checks if there is a non setting value before it
CURA-2361
2016-09-16 14:25:44 +02:00
Jaime van Kessel
4f547fff8d Category setting icon now becomes invible if clicked
CURA-2361
2016-09-16 13:58:26 +02:00
Jaime van Kessel
132ed1d258 Pressing inheritance button for category now makes all inherited children visible
CURA-2361
2016-09-16 13:10:14 +02:00
Jaime van Kessel
7793cb16d1 Updated documentation
CURA-2361
2016-09-16 12:49:15 +02:00
Jaime van Kessel
615ec67b1b Enabled property is now taken into account for inheritance override
CURA-2361
2016-09-16 11:49:23 +02:00
Jaime van Kessel
9a7057ce65 Use recursive check to add categories to list
CURA-2361
2016-09-16 11:45:57 +02:00
Jaime van Kessel
b43a5a7e31 Change order of initialisation, so we don't overwrite list with empty data
CURA-2361
2016-09-16 11:28:12 +02:00
Jaime van Kessel
e282e35b9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-16 11:19:19 +02:00
Jaime van Kessel
5d84490d70 SettingInheritance manager now has a complete list of all settings that have inheritance overridden
CURA-2361
2016-09-16 11:18:20 +02:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager
CURA-2361
2016-09-16 09:38:52 +02:00
Jack Ha
692eb42aa7 When switching nozzle or material, drop mismatching quality changes. CURA-2248 2016-09-15 17:05:14 +02:00
Jaime van Kessel
a5e6742cfa Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-15 09:43:11 +02:00
Jaime van Kessel
277123d1d3 Brim, raft & skirt settings are now retrieved from correct extruder (if any)
CURA-2245
2016-09-15 09:42:13 +02:00
fieldOfView
151fcfdda6 Update method order for readability 2016-09-14 15:15:54 +02:00
fieldOfView
ab50ac0d89 Don't show possibly incorrect materials in print monitor 2016-09-14 13:59:00 +02:00
Jaime van Kessel
98a759196d Simplified Buildvolume
CURA-2245
2016-09-14 13:25:29 +02:00
Jaime van Kessel
02c1a8d069 Fixed wrong indenting 2016-09-14 12:52:15 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
Jaime van Kessel
d6e95d2734 Added error state for container state if serialization data is none
CURA-2359
2016-09-13 14:54:17 +02:00
Jaime van Kessel
4db1db302b Changed guid to GUID in the filter
We use the veriable as upper.
2016-09-13 14:35:45 +02:00
Jaime van Kessel
cb50c61293 Added missing import statement
CURA-2276
2016-09-13 12:51:37 +02:00
Jaime van Kessel
4088cc0f7e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 11:54:48 +02:00
Jaime van Kessel
570843bbb0 Filtering containers now also takes quality_definition into account
CURA-1780
2016-09-13 11:54:16 +02:00
Simon Edwards
8086646de1 When reverting a user setting be sure to delete it from all of the stacks, global and extruder.
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
2016-09-13 11:33:33 +02:00
fieldOfView
224e6d37a8 Add materialNames property to get user-facing texts from printer
inb4 string-freeze
CURA-2276
2016-09-13 10:53:21 +02:00
Jaime van Kessel
8f65ed4c4e 0 is now seen as a correct value by QualitySettingsModel
CURA-2293
2016-09-12 15:36:57 +02:00
Jaime van Kessel
8dbe67a6bf Added printer state to output device
CURA-2235
2016-09-12 13:30:43 +02:00
Jaime van Kessel
44092f0b96 Printers with a quality_definition now also create quality changes using that definition
CURA-1780
2016-09-12 13:00:01 +02:00
Jaime van Kessel
03c28537f2 Added function to save a single stack to file.
CURA-2279
2016-09-12 11:58:51 +02:00
Jaime van Kessel
f6c1a46d22 Remove commented out code
CURA-2234
2016-09-09 13:28:12 +02:00
Jaime van Kessel
2441275f29 Added message when incompatbile material is selected
CURA-2271
2016-09-09 12:57:50 +02:00
Jaime van Kessel
9770037398 If setting is false, it will still return false (instead of empty string)
CURA-2271
2016-09-09 11:44:41 +02:00
Jaime van Kessel
e7335d9814 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:53:21 +02:00
Jaime van Kessel
d34f54a3c7 Right type is now returned if metadata entry is not found
CURA-2242
2016-09-09 10:29:16 +02:00
fieldOfView
40ae75f54f Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 18:50:53 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from
CURA-1780
2016-09-08 18:49:34 +02:00
Jack Ha
f4bf1809c6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-08 17:38:16 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
544941e33e Signals are now only emitted when setting changed instead of always. 2016-09-08 17:20:01 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers
CURA-2242
2016-09-08 14:15:00 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting"
This reverts commit 46942d7cf2.

It was not my decision to make
2016-09-08 14:04:58 +02:00
fieldOfView
46942d7cf2 Remove "infill mesh" as a standard visible setting 2016-09-08 14:02:44 +02:00
Jaime van Kessel
09f7d9b999 We shuffle the list of nodes so that the push free won't endlessly repeat the same 2 steps 2016-09-08 12:49:42 +02:00
Jaime van Kessel
30e08da8aa Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 17:19:49 +02:00
Jaime van Kessel
9a84deb14e If buildplate has errors, slicing is not possible
CURA-2234
2016-09-07 17:19:20 +02:00