Commit graph

496 commits

Author SHA1 Message Date
Jaime van Kessel
5a49457bfe Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 14:13:34 +02:00
Jaime van Kessel
829d341f7f When import multi extrusion profile, they now all get the same name
CURA-2462
2016-09-27 14:13:06 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account.
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-27 14:11:19 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code
CURA-2462
2016-09-27 14:05:56 +02:00
Jaime van Kessel
9e47a87375 If no quality container can be found, use empty instead
CURA-2462
2016-09-27 13:26:44 +02:00
fieldOfView
3d7680a983 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-26 10:58:57 +02:00
fieldOfView
3d61b7fb75 Prevent signal storm when changing a property
Contributes to CURA-2429
2016-09-26 10:58:15 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Aldo Hoeben
281f9e18a3 Merge pull request #994 from Ultimaker/optimise_machine_switch
Speed up switching between multiextrusion machines
2016-09-23 12:01:17 +02:00
Jaime van Kessel
0b6c196659 Moved getAllExtruderValues to extruder manager
CURA-2407
2016-09-22 16:36:27 +02:00
fieldOfView
847d6429d0 Speed up switching between multiextrusion machines
ExtruderManager.addMachineExtruders is supposed to create a cache, but this cache was always rebuilt because of an indentation error.
2016-09-22 13:49:18 +02:00
Simon Edwards
983e963dd3 Fix for deleting quality changes profiles.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:59:03 +02:00
fieldOfView
fef1cfb5e8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 11:23:06 +02:00
fieldOfView
170a689b59 Select the correct preferred variant for multiextrusion printers
CURA-2424
2016-09-22 11:22:54 +02:00
Simon Edwards
8cbe410e34 Fix for creating profiles via the Create button.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:07:25 +02:00
Simon Edwards
46dd4f6093 Fix for duplicating quality changes profiles on the UM2.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 16:51:30 +02:00
Jaime van Kessel
51dee95c8f Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 16:37:39 +02:00
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well
CURA-2424
2016-09-21 16:36:45 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent.
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 15:26:20 +02:00
Jaime van Kessel
eb1d5e13d0 Only disconnect old stack if we found a new one
CURA-2361
2016-09-21 11:25:57 +02:00
Jaime van Kessel
0cfa8c0205 Fixed check for has_variant_materials
CURA-2271
2016-09-20 15:11:20 +02:00
Jack Ha
2b4377b509 Fixed update resolvements by moving signal emits. CURA-2232 2016-09-20 14:03:55 +02:00
Jaime van Kessel
789db04d03 Inheritance manager now also listens to global property changed
CURA-2361
2016-09-20 09:41:04 +02:00
Jaime van Kessel
aac395cb79 Settings that are not settable per extruder but used by settings who are are now also copied
CURA-2409
2016-09-19 13:01:31 +02:00
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
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
02c1a8d069 Fixed wrong indenting 2016-09-14 12:52:15 +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
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
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
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
2441275f29 Added message when incompatbile material is selected
CURA-2271
2016-09-09 12:57:50 +02:00