Commit graph

496 commits

Author SHA1 Message Date
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
2ee2bc7348 Properly implement ContainerManager::createQualityChanges
Contributes to CURA-2006
2016-08-04 17:37:15 +02:00
Arjen Hiemstra
b76ebbb850 Ensure we have an empty quality changes container in the extruder stack
Contributes to CURA-2006
2016-08-04 17:36:39 +02:00
Arjen Hiemstra
ec383b46b9 Emit blurSettings for ContainerManager::merge/clear user containers
Contributes to CURA-2006
2016-08-04 17:33:35 +02:00
Ghostkeeper
50cd98f2bb
Allow extruderValue(s) to fallback to global
If a setting is not defined in the extruder stack, fall back to global. At least it still tries to get the extruder value from the correct stack first. If that stack has no value, then so be it, use global anyway.

Contributes to issue CURA-2024. Also could affect issue CURA-2006.
2016-08-04 16:54:43 +02:00
Arjen Hiemstra
9ef709962f Start implementing a createQualityChanges method in ContainerManager
It will be used to create the quality change containers from the
existing user containers.

Contributes to CURA-2006
2016-08-04 02:12:32 +02:00
Arjen Hiemstra
0934ae70a8 Introduce clearUserContainers and updateQualityChanges methods in ContainerManager
They are moved from MachineManager which is really getting too large and
complicated.

Contributes to CURA-2006
2016-08-04 02:11:35 +02:00
Arjen Hiemstra
95c3aa8251 Split ContainerManager::mergeContainer into a checking bit and a function that does the actual work
Contributes to CURA-2006
2016-08-04 02:10:28 +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
Ghostkeeper
557044b11c
Remove print statement
Wasn't meant to be committed, I reckon.

Contributes to issue CURA-2022.
2016-08-03 12:39:01 +02:00
Arjen Hiemstra
791d51df2a Expose an extruderValue() function to value functions
It can be used to get the value of a specific extruder

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
a7187e7fe3 Document getExtruderValues 2016-08-02 19:42:40 +02:00
Arjen Hiemstra
3c35830cb8 Expose an extruderValue() function to value functions
It returns the value of a setting of a specific extruder.

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
b102a6cedd Expose an extruderValues() function to value functions
It returns a list of values for all extruders so that things like max()
work.

Contributes to CURA-2009
2016-08-02 19:42:40 +02:00
Arjen Hiemstra
22b6ab9c42 Set the extruder stack to a proper default when creating SettingOverrideDecorator
Turns out it otherwise fails to send the right data.

Fixes CURA-2032
2016-08-02 13:58:16 +02:00
Arjen Hiemstra
9773a16bc6 Properly set active extruder when deepcopying SettingOverrideDecorator
Fixes CURA-2022
2016-08-02 11:33:23 +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
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
2016-07-28 18:08:17 +02:00
Jaime van Kessel
fe205b51f9 Per object settings now use correct stack
CURA-1934
2016-07-28 14:45:49 +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
f51cffdf2e We now ask the stack for the position (instead of definition) 2016-07-25 13:50:47 +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 568d30d17b. Turned out this causes recursion issue when changing materials
2016-07-22 09:33:44 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up)
CURA-1758
2016-07-21 21:42:02 +02:00
Jaime van Kessel
568d30d17b Commented out 2 lines of code that caused issues with reset
The documentation doesn't mention why the code is there, so i've commented them out for the time beeing

CURA-1758
2016-07-21 21:19:25 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack
CURA-1758
2016-07-21 20:54:02 +02:00
fieldOfView
caa202e3d6 Make sure values from loaded profile permeate to other stacks
CURA-1758
2016-07-21 15:28:10 +02:00
fieldOfView
a64e0fa8e8 Fix copyValueToExtruders (rebase-accident)
CURA-1758
2016-07-21 15:12:31 +02:00
fieldOfView
baf9d81e47 Massively simplify the strategy
This removes the *_global_variant, *_global_material and *_global_quality profiles and instead uses the same profiles for the global stack as for extrude 0.

CURA-1758
2016-07-21 15:12:31 +02:00
fieldOfView
0857017ac6 Add a context-menu item to copy a value to all extruders.
CURA-1758
2016-07-21 15:12:30 +02:00
fieldOfView
89b601791d Fix possible error when a printer fails to load
CURA-1758
2016-07-21 15:12:30 +02:00
fieldOfView
fa8b58844d Initialise multiextrusion global stacks to new empty profiles
_EmptyInstanceContainer does not allow setting properties and does not emit signals

CURA-1758
2016-07-21 15:12:30 +02:00
fieldOfView
2e75430d0e Update the global container when switching variant/material/quality profiles
CURA-1758
2016-07-21 15:12:29 +02:00
fieldOfView
81f9467ca0 Update the global value when the "global_inherits_stack" value changes
CURA-1758
2016-07-21 15:12:29 +02:00
fieldOfView
16315b6e1d Fix reset value icon on non-per-extruder-settable settings
CURA-1758
2016-07-21 15:12:28 +02:00
fieldOfView
5d613bd22e Make sure _active_container_stack is properly initiated
CURA-1758
2016-07-21 15:12:28 +02:00
fieldOfView
8a6f41d7e7 Initialise multiextrusion global stacks to empty profiles
CURA-1758
2016-07-21 15:12:27 +02:00
fieldOfView
a48b3b7398 Select first extruder when switching to a printer
The days of the global tab are numbered

CURA-1758
2016-07-21 15:12:27 +02:00