Commit graph

2275 commits

Author SHA1 Message Date
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
fieldOfView
97b3dd8f70 Copy values of global-only setting values to all extruders
CURA-1758
2016-07-21 15:12:25 +02:00
fieldOfView
2387da1a28 Make the global stack value mirror the stack value appropriate for this setting
CURA-1758
2016-07-21 15:12:25 +02:00
fieldOfView
121cd19e83 Disable the settings in the global tab
CURA-1758
2016-07-21 15:12:24 +02:00
Jaime van Kessel
923e4de4ed Stack changes now also ensure that validation state change signal is emitted
CURA-1890
2016-07-20 11:13:24 +02:00
fieldOfView
4b7066e55b Fix adding quality profile to stack twice
CURA-1926
2016-07-19 08:29:47 +02:00
fieldOfView
dec94443db Initialise extruder quality profile to a profile that is appropriate for this machine/variant/material
Fixes CURA-1926
2016-07-18 19:39:47 +02:00
Jaime van Kessel
6249675362 Removed stray debug prints
CURA-1669
2016-07-18 17:18:25 +02:00
fieldOfView
935481e05f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-18 09:41:50 +02:00
Jaime van Kessel
56efb92f3e Added additional decoration to UpdateQualityContainerFromUserContainer
This allows the usage from QML withouth parameters. CURA-1890
2016-07-15 16:04:02 +02:00
Jaime van Kessel
951e7bf629 Refusing to change material actually prevents material from being changed
CURA-1909
2016-07-15 11:40:43 +02:00
fieldOfView
cd4774565b Add missing copyright notice 2016-07-14 18:44:29 +02:00
Jaime van Kessel
dfd56d049f getActiveExtruderStack now returns stack based on machine_id instead of definiton ID
Contributes to CURA-1898
2016-07-13 13:08:14 +02:00
Jaime van Kessel
726eb97d9f Machine_id instead of definition_id is now used to link extruders
Contributes to CURA-1898
2016-07-13 11:17:44 +02:00
Jaime van Kessel
936617f2aa Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-13 09:49:20 +02:00
Jaime van Kessel
b0137016f7 Fixed formating of documentation
CURA-1898
2016-07-13 09:46:23 +02:00
Simon Edwards
642ea6791b When saving the quality profile data, also incorporate any user settings/changes.
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
2016-07-13 09:29:47 +02:00
fieldOfView
b622c7ecc8 Initialise variant, material and quality to empty containers of the respective type
Before it would be impossible to switch to a valid option once a variant/material/quality had gone to an "empty" state. Now at least it is recoverable.
2016-07-12 18:29:40 +02:00
fieldOfView
f5f3f9c516 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-12 13:10:08 +02:00
fieldOfView
08213890fb Remove reliance on "_current_settings" postfix when removing user profile containers
CURA-1896
2016-07-12 13:09:53 +02:00
Simon Edwards
64ecb114b8 Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import.
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
2016-07-12 12:41:49 +02:00
fieldOfView
ae4beeb0ed Remove container stack and user profile for extruders when removing a printer
CURA-1896
2016-07-12 10:53:50 +02:00