41 Commits

Author SHA1 Message Date
fieldOfView
d6ddf15e24 Fix selecting material for UM2 when switching from UltiGcode 2017-07-09 16:46:25 +02:00
fieldOfView
8c2f556616 Switch to an appropriate material when changing the material diameter
If we don't do this, the material will always override the setting in Machine Settings
2017-07-09 16:41:24 +02:00
fieldOfView
ddc94e9bec Improve readability 2017-07-09 15:44:01 +02:00
fieldOfView
de0ac5ccff Use CuraContainerStack API 2017-07-09 11:28:14 +02:00
Jaime van Kessel
b18b1d3cd0 Only disable timer of backend if it's initialised
Fixes #1939
2017-06-06 15:42:49 +02:00
Lipu Fei
40d70b5f39 Fix version upgrade for project loading
CURA-3756
2017-05-16 14:38:27 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Jaime van Kessel
316f2bbdb5 Fixed switching g-code flavors with machineAction 2017-05-10 09:49:33 +02:00
fieldOfView
98b127851b Fix setting number of extruders when hasVariants is set 2017-05-08 12:54:12 +02:00
Ghostkeeper
41e444714f
Fix spacing
Minor code style stuff.
2017-05-03 16:54:20 +02:00
Ghostkeeper
cd78ab850d
Remove semicolons
Semicolons, a relic of the past.

Contributes to issue CURA-3497.
2017-05-03 16:03:47 +02:00
Ghostkeeper
337be1b9be
Fix setting machine changes profile with new specified container stacks
Don't need to insert it, because there's already a slot for it on the stack. In fact, you're not allowed to insert anything.

Contributes to issue CURA-3497.
2017-05-03 15:38:20 +02:00
Jack Ha
0452cffff9 Fix setting active extruder when changing Custom FDM printer extruders. CURA-3299 2017-05-03 09:37:12 +02:00
fieldOfView
57f936e5ff Remove definition_changes containers when a stack is removed 2017-04-24 13:56:37 +02:00
fieldOfView
8b5ac81404 Fix extruder_stack global values are moved to
ExtruderManager.getMachineExtruders() result is not sorted, the result of getActiveExtruderStacks() is
2017-04-24 13:20:20 +02:00
fieldOfView
3e9fdb5db1 Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes 2017-04-24 13:11:10 +02:00
fieldOfView
fab0fa1dde Move setting values that are settable per extruder from/to global stack when setting extruder count 2017-04-24 12:58:20 +02:00
fieldOfView
d2d36b8c98 Lower extruder_nr settings when they exceed the number of extruders 2017-04-22 12:17:16 +02:00
fieldOfView
2ca24ba7e6 Restore both material and variant to match 1st extruder when switching to single extrusion 2017-04-22 11:20:55 +02:00
fieldOfView
8d42f9c187 Move some convoluted logic from QML into Python 2017-04-22 10:13:58 +02:00
fieldOfView
933ee408e4 Code style 2017-04-22 09:47:00 +02:00
fieldOfView
ba229444b7 Pause autoslicing while the MachineSettingsAction is open
Each setting-change would cause a reslice, which is unnecessary.
2017-04-21 21:05:28 +02:00
fieldOfView
6e0221636d Save definition_changes in their own folder 2017-04-15 20:03:09 +02:00
fieldOfView
12079fc9da Add documentation 2017-04-15 18:55:59 +02:00
fieldOfView
df7f039826 Store extruder settings in definition_changes containers 2017-04-10 18:26:10 +02:00
fieldOfView
e853d87779 Add control to set the number of extruders in Machine Settings 2017-04-06 09:41:15 +02:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Jaime van Kessel
9f13338c17 Codestyle 2016-12-06 14:28:25 +01:00
fieldOfView
21bcb0e434 Create a definition_changes container instead of a second variant 2016-11-23 22:53:03 +01:00
fieldOfView
497b6f99a4 Fix finding existing variant by id
ContainerStack.findContainer cannot find a container by id directly.
2016-11-23 22:04:19 +01:00
fieldOfView
78475d68b3 Fix creating variants 2016-11-23 22:04:18 +01:00
fieldOfView
c8cedb301a Use insertContainer instead of adding a parameter to addContainer 2016-11-23 22:04:18 +01:00
fieldOfView
b6689870f5 Make Machine Settings compatible with machines that use variants (UM2+)
For machines that use variants, a second variant container is added between the machine definition and the variant.
2016-11-23 22:04:16 +01:00
fieldOfView
1325c31882 Remove hardcoded container index 2016-11-23 22:04:16 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking).
CURA-2917
2016-11-21 21:36:08 +01:00
fieldOfView
8b0587e75a Add logging with reason why printers don't have MachineSettings action 2016-08-16 21:10:58 +02:00
fieldOfView
9b048efe22 Fixed copyrights 2016-08-16 18:19:25 +02:00
fieldOfView
9e7e469df8 Move plugin files into main repo location 2016-08-15 16:06:34 +02:00