Jack Ha
552618fcd4
CURA-4400 added function to find model index by extruder position in SettingExtruder
2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +01:00
Lipu Fei
a81981a27a
Better info on no profiles to import for gcode
...
CIRA-4946
If a gcode is sliced with default profiles, there won't be any custom
profiles to import from that gcode. In that case, we show a info message
telling the user about this instead of showing an error message.
2018-03-09 16:40:57 +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
a9976e93c1
CURA-4400 fix per object setting change reslicing without reevaluate is non printing mesh all the time
2018-03-08 13:57:11 +01:00
Jack Ha
3b8d470323
Merge branch 'master' into feature_enable_disable_extruder
2018-03-08 09:35:49 +01:00
Lipu Fei
2a10c9a2d7
Move assertion in _performMerge()
...
CURA-5070
2018-03-08 09:10:45 +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
bab46d7048
CURA-4400 only reevaluate non printing mesh if the setting actually matters
2018-03-06 17:19:31 +01:00
Jack Ha
32ce458516
CURA-4400 solved merge conflict
2018-03-06 17:05:39 +01:00
Aleksei S
6bb42da056
Removed related commits to Settins per Object validation and
...
added short validation in StartScliceJob
CURA-4972
2018-03-06 15:40:26 +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
ChrisTerBeke
96b40433a9
Merge branch 'master' into docker
2018-03-06 11:19:30 +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
3004b146ad
Fix: move createQualityChanges() to QualityManager
...
CURA-4606
2018-03-05 13:36:13 +01:00
Jack Ha
b0801d40e3
CURA-4400 added metadata entry for enabled instead of internal variable
2018-03-05 12:47:32 +01:00
Lipu Fei
a29a6122f1
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-03-05 11:29:21 +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
Lipu Fei
a2c2282b44
Use context to evaluate materialDiameter
2018-03-03 15:50:33 +01:00
Lipu Fei
7216641fad
Update doc for _fixMaterialDiameterAndNozzleSize()
2018-03-03 15:44:28 +01:00
Lipu Fei
a09bf7faa6
Move comments for _fixMaterialDiameterAndNozzleSize()
2018-03-03 15:31:59 +01:00
Lipu Fei
6db26eaca5
Add getDefaultMaterial() in MaterialManager
2018-03-03 15:29:49 +01:00
Lipu Fei
86e12fc437
Add getDefaultVariantNode() in VariantManager
2018-03-03 15:21:29 +01:00
Lipu Fei
5d5932547c
Cleanup imports for ContainerManager
2018-03-03 15:07:42 +01:00
Lipu Fei
c93643bc2f
Move createMaterial() to MaterialManager
2018-03-02 17:30:19 +01:00
Lipu Fei
5f0bb3a283
Move removeMaterial() to MaterialManager
2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe
Move duplicateMaterial() to MaterialManager
2018-03-02 17:16:35 +01:00
Lipu Fei
ca785c9df3
Move duplicateQualityChanges() to QualityManager
2018-03-02 17:08:58 +01:00
Ian Paschal
1f403f815d
CURA-4972 Moved validation to SettingOverrideDecorator.py
...
**The diagnosis:**
The issue arrises from the fact that while the original object is subscribed to be validated, that subscription is only created by setting it as a settings override object. A clone of that object, while still a settings-override object, never gets subscribed because it's not explicitly set with the tool.
**The solution (?):**
I moved all the validation stuff over to SettingOverrideDecorator.py, and use its onSettingChanged() function to trigger the validation. Unfortunately, I can't use the timer because of some limitation with QTTimer and threads. So it's _a bit laggy in some places, and I'd be open to tips about how to fix this. It does work reliably though.
2018-03-02 17:05:58 +01:00
Lipu Fei
355b8cbac3
Move renameQualityChangesGroup() into QualityManager
2018-03-02 16:58:50 +01:00
Lipu Fei
8324f4f44e
Move removeQualityChangesGroup() into QualityManager
2018-03-02 16:47:25 +01:00
Lipu Fei
6cae82a64e
Fix comments for createQualityChanges()
2018-03-02 16:42:10 +01:00
Lipu Fei
c6128ef5ba
Move setMaterialName() into MaterialManager
2018-03-02 16:22:22 +01:00