32 Commits

Author SHA1 Message Date
Lipu Fei
862cbe0211 Check global_stack before updating in SettingInheritanceManager
CURA-3756
2017-05-19 15:23:30 +02:00
Jaime van Kessel
fb0df3109c Fixed inhertiance manager getting update from a Category setting 2017-04-24 13:10:33 +02:00
Jaime van Kessel
2297a6e80b Fixed inhertiance manager crashing if there is no parent 2017-04-24 13:05:39 +02:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Jack Ha
4085cfe67e Fix crash loading almost empty project. Added return value to functions in SettingInheritanceManager 2016-12-13 16:03:26 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Jaime van Kessel
8c35c8fbc3 Inheritance manager no longer sees settings as setting if they use enum value 2016-11-23 17:27:27 +01:00
Jaime van Kessel
c1dda7505c Inheritance manager now also checks for inheritance if enabled property changed
CURA-2860
2016-11-23 12:47:54 +01:00
Jaime van Kessel
e17eda9a33 Removed debug prints
CURA-2860
2016-11-22 15:25:54 +01:00
Jaime van Kessel
75e067cab7 No longer select last_entry that isn't in the list
CURA-2860
2016-11-22 15:24:01 +01:00
Jaime van Kessel
867463f718 InheritanceManager now checks if a setting function can actually change before labeling it
CURA-2860
2016-11-04 15:59:01 +01:00
Jaime van Kessel
a8486f88d7 Inheritance icon is correctly shown for single extrusion printers if setting has limit_to_extruder property
CURA-2752
2016-10-26 15:43:26 +02:00
Arjen Hiemstra
bdaa4a5a6d Add a method to get overrides for a specified (extruder)stack
Since the main getOverrides method only accounts for the active extruder
and we sometimes need to check other extruders in case of
limit_to_extruder.

Contributes to CURA-2752
2016-10-24 17:10:26 +02:00
Jaime van Kessel
7f1b060ef9 SettingInstanceManager now also watches containerchanged of extruder stacks
CURA-2674
2016-10-24 13:50:49 +02:00
Simon Edwards
6d1f766ef3 Fixed for the inheritance icon and custom profiles.
CURA-2674 Inheritance icon not shown for saved profile.
2016-10-18 13:18:56 +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
789db04d03 Inheritance manager now also listens to global property changed
CURA-2361
2016-09-20 09:41:04 +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
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
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