Ghostkeeper
d904f677bc
Store extruder position of quality groups as int
...
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.
Contributes to issue CURA-4606.
2018-03-12 17:08:13 +01:00
Jack Ha
c4fb15a569
CURA-4400 resolve merge conflict
2018-03-12 15:18:35 +01:00
Diego Prado Gesto
809db6a4d9
CURA-5078 Remove material warning if the mismatch was the buildplate.
2018-03-12 15:09:56 +01:00
Jack Ha
d889795721
CURA-4400 correctly cope with quality changes that conflict with the current enabled extruders
2018-03-12 14:15:49 +01:00
Jack Ha
aa3cd8ba9d
Solved merge conflict
2018-03-12 11:39:39 +01:00
Lipu Fei
2c5cc17b49
Fix build plate compatibility check
...
CURA-5078
2018-03-12 10:34:18 +01:00
Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +01:00
Lipu Fei
de72dd3455
Fix material update upon gcode flavour change
...
CURA-5060
2018-03-09 14:26:53 +01:00
Lipu Fei
ef8cd304dc
No keep/discard setting dialog in project loading
...
CURA-4966
2018-03-08 20:00:21 +01:00
Lipu Fei
6aefb2215d
Fix _setQualityChangesGroup()
...
CURA-4966
2018-03-08 19:50:45 +01:00
Jack Ha
0d61b6652c
CURA-4400 merge two if statements in 1
2018-03-08 15:38:32 +01:00
Jack Ha
138f77179d
CURA-4400 fix errors when switch or adding to new machine
2018-03-08 14:31:55 +01:00
Jack Ha
f576b1f117
CURA-4400 fix crash when switching from disabled 1st extruder to single extruder machine
2018-03-08 14:28:57 +01:00
Jack Ha
3b8d470323
Merge branch 'master' into feature_enable_disable_extruder
2018-03-08 09:35:49 +01:00
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker
...
Docker support
2018-03-07 11:08:42 -08:00
Jack Ha
ff1c378c08
CURA-4400 fix start slicing when disabled extruder is incompatible
2018-03-07 11:38:35 +01:00
Jack Ha
4568fab531
CURA-4400 fix quality profiles model to not use disabled extruder and update Not Supported or select a valid quality when enabling/disabling extruder
2018-03-07 11:27:23 +01:00
Jack Ha
32ce458516
CURA-4400 solved merge conflict
2018-03-06 17:05:39 +01:00
Lipu Fei
fb798ab7e5
Small refactor in MachineManager and add more loggings
...
CURA-4606
- Added more info loggings
- Changed some variant names
- Use some shortcut variables instead of getInstance()s
2018-03-06 15:30:39 +01:00
Jack Ha
8ebd778224
CURA-4400 force update all settings if something changed with the extruder
2018-03-06 11:48:22 +01:00
Jack Ha
00a173b1bf
CURA-4400 when enabling / disabling extruder, remove user changes that are no longer enabled
2018-03-06 09:55:43 +01:00
ChrisTerBeke
5a8f2040d3
Add method to machine manager to get a machine stack by definition id
2018-03-05 17:53:40 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
Jack Ha
37d02da1f1
CURA-4400 restore correct default extruder, added extruders_enabled_count and use that in fdmprinters (result: i.e. one at a time can be enabled by disabling an extruder)
2018-03-05 14:01:39 +01:00
Lipu Fei
174bc7dbd7
Remove commented code in MachineManager
2018-03-03 16:04:30 +01:00
Lipu Fei
a220b55856
Simplify code in MachineManager
2018-03-03 16:01:59 +01:00
Lipu Fei
413e4ca55d
Add doc for _setEmptyQuality()
2018-03-03 15:59:59 +01:00
Lipu Fei
bb04afa2ab
Remove non-sense comments in MachineManager
2018-03-03 15:57:28 +01:00
Lipu Fei
89716acc11
Remove redundant code in MachineManager
2018-03-03 15:56:08 +01:00
Lipu Fei
51fadc9868
Remove unnecessary _onMaterialsUpdated()
2018-03-03 15:53:46 +01:00
Lipu Fei
632be11323
Remove "#NEW"s
2018-03-03 15:51:51 +01:00
Jack Ha
53ec846436
CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager
2018-03-01 17:21:35 +01:00
Jack Ha
2538c689f1
CURA-4400 make extruder combobox disabled items grey
2018-03-01 16:22:40 +01:00
Jack Ha
ba7b18a88b
CURA-4400 corrected getProperty in correctExtruderSettings
2018-03-01 15:02:35 +01:00
Jack Ha
ac76d6ea52
Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder
2018-03-01 13:14:10 +01:00
Jack Ha
657a52a5e7
CURA-4400 add checking for enabled extruder in setting _outside_buildarea, cleaned up a bit and factored some functions out BuildVolume
2018-03-01 11:54:31 +01:00
Jack Ha
11bad271d3
CURA-4400 set extruder numbers of settings to an enabled extruder; added SettingOverrideDecorator by default in CuraSceneNode
2018-02-28 15:56:45 +01:00
Jack Ha
86c13e86c7
CURA-4400 first version that disables extruder and updates available quality profiles
2018-02-28 12:56:00 +01:00
Lipu Fei
6b0095014a
Fix merge conflicts from master
2018-02-28 12:52:45 +01:00
Lipu Fei
ab4cfa5fbb
Use userChanges instead of getContainer(0)
...
CURA-4916
2018-02-28 12:49:41 +01:00
Lipu Fei
07824c21e1
Move getMachineDefinitionIDForQualitySearch() into QualityManager.py
2018-02-28 11:48:20 +01:00
Aleksei S
e533c4604c
Update infill scroll bar if setting is changed in custom mode
...
CURA-4916
2018-02-28 10:52:46 +01:00
Jack Ha
ae00fc2a7e
CURA-4606 change activeQualityLayerHeight to use self._current_quality(_changes)_group
2018-02-27 15:15:04 +01:00
Jack Ha
cbeaf3b287
CURA-4606 set empty quality when setting active machine when the current quality type is not in the available qualities
2018-02-27 15:14:34 +01:00
Jack Ha
fae82ef242
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-27 13:57:37 +01:00
Jack Ha
08bfe93385
CURA-4606 CURA-5020 switching to quality changes now also checks and shows keep or discard user settings
2018-02-27 13:57:30 +01:00
Lipu Fei
a2e84bbe97
Fix set quality group in init machine
2018-02-27 13:49:20 +01:00
Lipu Fei
5412a29ef9
Fix update quality upon material change
2018-02-27 13:05:19 +01:00
Lipu Fei
0b8678d2ae
Explicitly create MachineManager
2018-02-26 19:33:16 +01:00
Lipu Fei
a3a206c6dd
Quality groups are QObjects
2018-02-22 23:07:49 +01:00
