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
Jack Ha
df46241225
CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack
2018-02-27 13:03:08 +01:00
Lipu Fei
17d3be03b4
Use getMaterialManager() in ContainerManager
2018-02-26 19:38:44 +01:00
Lipu Fei
0b8678d2ae
Explicitly create MachineManager
2018-02-26 19:33:16 +01:00
Jack Ha
d471e34e48
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-26 16:33:32 +01:00
Jack Ha
c23827cfa1
CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change
2018-02-26 16:33:25 +01:00
Lipu Fei
9ddc6a52b7
Refactor fix for extruder stack material diameters and nozzle sizes
2018-02-26 11:40:21 +01:00
Jack Ha
11be94c735
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-26 09:30:33 +01:00
Lipu Fei
f487c5b084
Fix profile management page
2018-02-22 23:31:41 +01:00
Lipu Fei
a3a206c6dd
Quality groups are QObjects
2018-02-22 23:07:49 +01:00
Lipu Fei
e53048079d
Remove debugging logs
2018-02-22 23:05:06 +01:00
Jack Ha
cad6a3bb3d
CURA-4606 CURA-5003 select and activate material after create, duplicate
2018-02-22 17:14:23 +01:00
Lipu Fei
d2ffd59431
Switch to the new quality profile when it is created
2018-02-22 16:53:13 +01:00
Lipu Fei
32e1015f25
WIP: Cleanup PrintInformation
2018-02-22 16:07:56 +01:00
Lipu Fei
ab8fda8812
Fix createMachine: evaluate material diameter if it is a function
2018-02-22 15:21:48 +01:00
Lipu Fei
b415a36110
WIP: Remove delayed update in MachineManager
2018-02-22 13:58:35 +01:00
Lipu Fei
25dd63dc21
WIP: Cleanup MachineManager
2018-02-22 13:45:46 +01:00
Lipu Fei
7a2c25226a
Fix initial quality_changes group setup
2018-02-22 12:59:26 +01:00
Lipu Fei
b014800eac
Fix various quality related issues
2018-02-22 11:00:32 +01:00
Lipu Fei
3095140bc3
Fix quality/qualityChanges group initialization
2018-02-22 10:27:18 +01:00
Lipu Fei
d83b803fe0
Fix: Update active material names if materials lookup table gets updated
2018-02-21 16:47:12 +01:00
Lipu Fei
7a3ebe1a42
Fix NozzleMenu active nozzle bullet
2018-02-21 16:36:42 +01:00
Jack Ha
244b109403
CURA-4606 CURA-4995 switching print core now correctly updates the material
2018-02-21 16:30:45 +01:00
Jack Ha
5ba0ac8a43
CURA-4606 switch to first extruder when switching machines; this prevents crashing when switching to single extruder machine
2018-02-21 15:59:49 +01:00
Lipu Fei
70d5cd2462
Fix: Replace all activeQualityName with activeQualityOrQualityChangesName
2018-02-21 14:30:33 +01:00
Jack Ha
435e99a2dd
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-21 14:16:32 +01:00
Jack Ha
631b72c007
CURA-4606 in all quality profiles, rename all the specific 1.75mm materials back to the generic material
2018-02-21 14:16:26 +01:00
Lipu Fei
9a354efd19
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-02-21 14:05:19 +01:00
Lipu Fei
02472f6ad2
WIP: Fix material name update upon machine switching
2018-02-21 12:39:04 +01:00
Lipu Fei
6cd47453bb
WIP: Fix activeMaterialsCompatible()
2018-02-21 11:36:46 +01:00
Jack Ha
2e3e01ff95
CURA-4606 Cleanup WorkspaceSummaryDialog and prepare for single extrusion mode
2018-02-21 11:13:35 +01:00
Jack Ha
471182333d
CURA-4606 refactored activeMaterialNames
2018-02-21 10:41:39 +01:00
Jack Ha
c3349baf39
CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName
2018-02-21 10:36:51 +01:00
Jack Ha
363db9e536
CURA-4606 no stack checking for errors on active extruder switch
2018-02-21 10:35:48 +01:00
Jack Ha
ad6548a5dc
CURA-4606 factored activeMaterialName out
2018-02-21 10:35:17 +01:00
Jack Ha
f9e2d7fe2c
CURA-4606 changing current print core now always updates the correct one
2018-02-21 09:17:31 +01:00
Jack Ha
8401e1c7f7
CURA-4606 incompatible material(s) now results in an empty quality list
2018-02-21 09:13:42 +01:00
Jack Ha
b96d49c010
CURA-4606 ensure startup order for machine manager before build volume to prevent errors there
2018-02-20 16:04:41 +01:00
Jack Ha
c56b3bc7bd
CURA-4606 add the discard or keep changes screen
2018-02-20 15:35:17 +01:00
Jack Ha
4ba7ce0890
CURA-4606 fix pyqt cleaning up by setting extruder stack parent
2018-02-20 15:26:20 +01:00
Jack Ha
9e9d981acd
CURA-4606 ensure that setting a new machine ends with correct quality (changes) group
2018-02-20 15:17:19 +01:00
Lipu Fei
fa37a48caa
WIP: Fix default buildplate lookup
2018-02-20 11:25:42 +01:00
Lipu Fei
c432d4ffbb
WIP: Simplify global stack and extruder stack activation and fixes
2018-02-20 11:16:51 +01:00
Diego Prado Gesto
6af5a5d4bc
CURA-4946 When storing the gcode profile, the definition must be the
...
quality definition if the printer has_machine_quality. Otherwise the
fdmprinter definition must be used as a fallback. If there is no
quality_definition then the printer definition is use.
2018-02-20 11:11:21 +01:00
Diego Prado Gesto
6a4f519238
Revert "CURA-4946 Add the quality_definition metadata entry to the gcode so when"
...
This reverts commit 744313af27
.
2018-02-20 09:30:05 +01:00
Lipu Fei
6cc65e97f2
WIP: Cleanup MaterialsModel
2018-02-20 09:13:11 +01:00
Lipu Fei
62c31c2f6c
WIP: Remove old QualityManager
2018-02-19 22:11:47 +01:00