138 Commits

Author SHA1 Message Date
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
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
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
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
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
Jaime van Kessel
6249675362 Removed stray debug prints
CURA-1669
2016-07-18 17:18:25 +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
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
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
08213890fb Remove reliance on "_current_settings" postfix when removing user profile containers
CURA-1896
2016-07-12 13:09:53 +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
fieldOfView
1b2514ae2e Fix setting the active container stack on start
When starting Cura, no nozzle, material or quality would seem to be selected. This commit makes sure _active_container_stack gets properly initialised.

I'll hijack CURA-1844 for this.
2016-07-11 18:10:25 +02:00
Arjen Hiemstra
99c2e3b1d1 Ensure machine, material and quality name changes are properly handled
Contributes to CURA-342
Fixes CURA-1669
2016-07-11 15:36:26 +02:00
fieldOfView
2a949237c1 Do not ask the user about keeping current settings when creating a profile from the current changes.
CURA-1885
2016-07-11 12:49:32 +02:00
Simon Edwards
f52f713694 Tightended up the signals associated with the extruders. Bug fixed.
CURA-1585 Profile dropdown options non functional.
2016-07-11 09:37:59 +02:00
Jaime van Kessel
b6e4bcb58f Updated documentation
CURA-537
2016-07-08 13:37:09 +02:00
Jaime van Kessel
31f97e0f61 Another set of fixes due to merge issues 2016-07-08 13:33:09 +02:00
Jaime van Kessel
6e7c263557 Improved logging 2016-07-08 13:31:54 +02:00
Jaime van Kessel
27d47b5c9c Fixes some issues due to merge 2016-07-08 13:22:40 +02:00
fieldOfView
fc74b53877 Add documentation
CURA-1850
2016-07-08 11:44:20 +02:00
fieldOfView
bf529c6425 Apply a flood control on messages about materials/hotends changed on the printer
CURA-1850
2016-07-08 11:26:24 +02:00
fieldOfView
c129b4b8b5 Let the user opt out of changing to the material/nozzle reported by the printer
CURA-1850
2016-07-08 11:25:31 +02:00
fieldOfView
4a9de156cb Ask the user about keeping current settings when switching quality profiles
CURA-1730
2016-07-08 11:25:30 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
2016-07-07 11:29:18 +02:00
Arjen Hiemstra
a882c43b2c Move MachineManager to cura/Settings and rename it to MachineManager
Contributes to CURA-342
2016-07-04 12:08:08 +02:00