387 Commits

Author SHA1 Message Date
Jaime van Kessel
3d41e25a4e Fixed setting visibility if a parent setting is not settable per extruder but it's relations are
This fix also removes the hack to ensure that use_support was set correctly.
Fixes CURA-2202
2016-08-29 13:43:42 +02:00
fieldOfView
0e602b8d0b Fix profile selection of UM2+ machines
CURA-2204
2016-08-29 11:49:39 +02:00
fieldOfView
b8ce37fd15 Fix search criteria when setting a quality
CURA-2204
2016-08-29 11:11:18 +02:00
Ghostkeeper
223489a637
Make mesh-specific global setting solution permanent
We've considered various other solutions but this is the only real solution available to us.

Contributes to issue CURA-2173.
2016-08-25 14:33:53 +02:00
fieldOfView
5119a7b6be Add a smidgen of documentation to the previous commit
CURA-2173
2016-08-25 14:08:37 +02:00
fieldOfView
3ca7e2bb8d Momentary fix for CURA-2173
We're not sure about the location and implementation but it fixes an important bug for now. At the very least this needs documentation.
2016-08-25 13:57:21 +02:00
fieldOfView
043343d536 Select correctly "inherited" profile when switching to a material that has no qualities of its own
CURA-2095
2016-08-25 10:46:19 +02:00
Ghostkeeper
36a33bb135
Retain quality profile when switching from no quality-changes profile
The old quality-changes profile was 'empty_quality_changes', not None.

Contributes to issue CURA-2006.
2016-08-23 17:27:09 +02:00
Ghostkeeper
f9e0e457ea
Retain active quality-changes when changing material
This wasn't updated yet for the new quality-changes functionality.

Contributes to issue CURA-2006.
2016-08-23 17:27:09 +02:00
Ghostkeeper
9ba9e90a8f
Turn if-clause into simple input check
Makes the code more readable in my opinion.

Contributes to issue CURA-2006.
2016-08-23 17:27:09 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
aefb36d1ec
Update activeValidationState if setting validation changed
This was removed from onGlobalSettingChanged but never re-added anywhere.

I've updated it to check for both the global and the active stack, since some settings modify only the global stack (such as layer height).

Contributes to issue CURA-2006.
2016-08-22 13:42:14 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality
CURA-2095
2016-08-22 11:31:31 +02:00
fieldOfView
52dda935fc Switch to a generic quality profile if a material has no specific qualities
CURA-2095
2016-08-22 11:14:53 +02:00
fieldOfView
063faf1520 Move the "Changes on Printer" dialog to JediWifiPrinting
...to have full control over the terminology
CURA-2116
2016-08-16 16:48:35 +02:00
fieldOfView
b2143e7d43 Remove code duplication
CURA-2116
2016-08-16 15:25:44 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
83b89d09d8 Fix for could not find quality xxx 2016-08-16 13:34:47 +02:00
Jack Ha
759ef29b1d Fix keep user settings dialog. 2016-08-16 13:12:34 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition
CURA-2116
2016-08-16 10:18:57 +02:00
Arjen Hiemstra
9f33fef4ec Use the new generator to simplify some extruder related code in MachineManager
Contributes to CURA-2006
2016-08-11 17:50:08 +02:00
Arjen Hiemstra
c557cd1a7a Move comment
Contributes to CURA-2006
2016-08-11 17:48:22 +02:00
fieldOfView
1848bb5cc4 Fix typo in Changes on the Printer dialog 2016-08-11 16:36:24 +02:00
Arjen Hiemstra
7ba49b4f88 Remove code that is obsolete and moved to ContainerManager
Contributes to CURA-2006
2016-08-10 11:58:40 +02:00
Arjen Hiemstra
578191bb8a Expose a list of all active materials in MachineManager
Contributes to CURA-2006
2016-08-10 10:59:43 +02:00
Arjen Hiemstra
6de7d0170a Expose quality changes id and quality type and make the profile menu work correctly
Contributes to CURA-2006
2016-08-10 10:58:44 +02:00
Arjen Hiemstra
450dcac394 Fix "keep current settings" dialog so it properly clears on "No"
Contributes to CURA-2006
2016-08-10 10:57:42 +02:00
Arjen Hiemstra
e2a4aeb8ff Use the new quality_type when setting the active quality
Contributes to CURA-2006
2016-08-10 10:57:12 +02:00
Arjen Hiemstra
4a02a9d1e3 Fix updating changed state for all stacks
Contributes to CURA-2006
2016-08-04 18:11:36 +02:00
Arjen Hiemstra
324d1415d7 Fix updating active quality
Contributes to CURA-2006
2016-08-04 17:55:16 +02:00
Arjen Hiemstra
d150acb79c Change setActiveQuality to set quality of extruders & global and also set change containers
Contributes to CURA-2006
2016-08-04 17:41:01 +02:00
Arjen Hiemstra
e2045cdb7f Remove obsolete container switcheroo
Contributes to CURA-2006
2016-08-04 17:40:16 +02:00
Arjen Hiemstra
5361efcf2c Return the name/id of the quality changes container if it is set for activeQuality
Contributes to CURA-2006
2016-08-04 17:39:52 +02:00
Arjen Hiemstra
10de07c08e Remove some code that was moved to ContainerManager
Contributes to CURA-2006
2016-08-04 17:39:09 +02:00
Arjen Hiemstra
aa8561fec7 Remove globalPropertyChanged
There should be no need for this if we properly store settings where
they should be stored.

Contributes to CURA-2006
2016-08-04 02:05:12 +02:00
Arjen Hiemstra
d42f390ed6 Add the new empty quality_changes container to new machines
Contributes to CURA-2006
2016-08-04 02:03:57 +02:00
Arjen Hiemstra
ab99100c56 Introduce an empty quality_changes container
Contributes to CURA-2006
2016-08-04 02:02:47 +02:00
fieldOfView
68fc9af4c2 Fix removing extruder stacks and extruder user profile
CURA-1898 broke fix for CURA-1896
2016-08-01 16:38:31 +02:00
fieldOfView
7b873fc397 Fix renaming profiles
CURA-2017
2016-08-01 16:05:57 +02:00
Jaime van Kessel
a1bd8f59ed Slicing no longer occurs when stack is invalid
CURA-1998
2016-07-28 13:14:07 +02:00
Jaime van Kessel
762ea15e78 Global inherited settings now use target (instead of active) stack to copy values
Fixes multiple issues with support settings not being updated properly
2016-07-27 09:54:02 +02:00
Jaime van Kessel
05b2c147e0 Combined material & hotend message
Even if all data is different, the update is correctly handled

CURA-1909
2016-07-26 13:28:53 +02:00
Jaime van Kessel
8540e10469 Updating multiple materials with one message box now works
CURA-1909
2016-07-26 12:10:25 +02:00
Jaime van Kessel
70242ba502 Saving a file no longer causes a re-slice
CURA-1933
2016-07-25 15:44:16 +02:00
Jaime van Kessel
000c4d5f41 Fixed issue where changing a setting would cause mismatch between stacks
CURA-1758
2016-07-25 09:58:33 +02:00
Jaime van Kessel
be252fb84f We now check if a setting can also be removed to get the same state
THis should prevent the reset buttons from showing up when there is nothing going on.

CURA-1758
2016-07-22 15:31:37 +02:00
Jaime van Kessel
83ec6e849a Multiple changes when quality profiles have different values should no longer break the link
CURA-1758
2016-07-22 13:16:35 +02:00
Jaime van Kessel
df46a61d38 Active stack should no longer influence changing of targeted settings
CURA-1758
2016-07-22 11:44:37 +02:00
Jaime van Kessel
cafb46cb1d First container is now updated withouth recursion possible
We now use a set of keys that we are handling in order to prevent the lock

CURA-1758
2016-07-22 10:43:26 +02:00
Jaime van Kessel
8307dba643 Revert "Commented out 2 lines of code that caused issues with reset"
This reverts commit 568d30d17b85dc1fd5bd4ab784e750ac237cdb39. Turned out this causes recursion issue when changing materials
2016-07-22 09:33:44 +02:00