1040 Commits

Author SHA1 Message Date
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
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
a7585a4b9a Ignore default container types when creating name filters for containers
Contributes to CURA-342
2016-07-11 16:41:57 +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
fieldOfView
f30bfafd4d Select a material for the extruder that is intended for the correct machine
CURA-1878
2016-07-09 15:35:55 +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
8e63016ef3 Add logging to explain why ContainerManager's methods do not complete successfully
Contributes to CURA-341
2016-07-07 12:07:16 +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
1f6e99f641 Add methods to get name filters, import and export containers to ContainerManager
We should start replacing the other ways of import/export with this
since this uses the containerregistry provided contaienr types instead
of needing a different plugin type.

Contributes to CURA-341
2016-07-07 01:39:38 +02:00
Arjen Hiemstra
6e153414a4 Do not try to write to read-only containers
Contributes to CURA-341
2016-07-07 01:37:54 +02:00
Arjen Hiemstra
ce065d110d Finish implementation of ContainerManager
Contributes to CURA-341
2016-07-05 16:45:23 +02:00
Arjen Hiemstra
ff9e4c9bb7 Add some more documentation to ContainerManager
Contributes to CURA-341
2016-07-05 16:44:13 +02:00
Arjen Hiemstra
6fbe354839 Fix ExtrudersModel to use the right location for ExtruderManager
Contributes to CURA-342
2016-07-04 13:03:10 +02:00
Arjen Hiemstra
ce3a5f7e48 Update references to moved classes so things work again
Contributes to CURA-342
2016-07-04 12:08:38 +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
Arjen Hiemstra
0e28b331fb Move Cura setting related classes to cura/Settings
Contributes to CURA-342
2016-07-04 12:07:29 +02:00
Arjen Hiemstra
a746710e26 Introduce a MaterialSettingsVisibilityHandler that will only show those settings relevant for materials
Contriubtes to CURA-342
2016-06-28 17:30:46 +02:00