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
Jack Ha
b3ef4a05d5
CURA-4606 skip non global qualities when looking for extruder qualities
2018-02-21 13:18:59 +01:00
Lipu Fei
b7659edd3b
WIP: Remove unused ID role in QualityProfilesModel
2018-02-21 12:40:56 +01:00
Lipu Fei
3364e24988
WIP: Be less wordy
2018-02-21 12:39:54 +01:00
Lipu Fei
02472f6ad2
WIP: Fix material name update upon machine switching
2018-02-21 12:39:04 +01:00
Lipu Fei
c411091fde
WIP: Only add global_quality containers for global stack qualities
2018-02-21 11:47:08 +01:00
Lipu Fei
a4a1babc59
WIP: Fix UM2 quality profiles
...
- Remove layer_height from the profiles because they are not global
qualities
- The layer_heights are the same as the default ones so no need to
make specific global qualities for UM2
2018-02-21 11:37:17 +01:00
Lipu Fei
6cd47453bb
WIP: Fix activeMaterialsCompatible()
2018-02-21 11:36:46 +01:00
Lipu Fei
ec8ee6e31a
WIP: Fix quality name in workspace summary dialog
2018-02-21 11:22:10 +01:00
Lipu Fei
6e5fed6b5e
WIP: Fix quality name in SettingView
2018-02-21 11:21:16 +01:00
Lipu Fei
c65192000e
WIP: Fix material name fetching in QML
2018-02-21 11:19:18 +01:00
Lipu Fei
628d031542
WIP: Fix models to check if global stack exists
2018-02-21 11:14:23 +01:00
Jack Ha
0649f177b4
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-21 11:13:44 +01:00
Jack Ha
2e3e01ff95
CURA-4606 Cleanup WorkspaceSummaryDialog and prepare for single extrusion mode
2018-02-21 11:13:35 +01:00
Lipu Fei
76f431af76
WIP: Only fetch variants if the machine has any
2018-02-21 11:06:28 +01:00
Lipu Fei
be211b7311
WIP: Fix quality profiles for abax_pri5
...
- Removed redundant quality profiles for abax_pri5 and reuse the abax_pri3
ones
- Fix abax_pri5 definition file: has_machine_quality = true
2018-02-21 11:06:28 +01:00
Lipu Fei
c338e1b7d6
WIP: Fix quality profiles for abax_pri3
...
- Fixed duplicated quality_type and name for qualities "Fast" and "Fine"
- Moved global settings to separate global quality files
- Fix abax_pri3 definition file: has_machine_quality = true
- MAYBE FIXME: Normal and Fast have the same layer height. Don't know if
that's intended. They are kept as before.
2018-02-21 11:06:28 +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
Jack Ha
b9e7ee18a6
CURA-4606 fixed menu setting nozzle
2018-02-20 13:06:54 +01:00
Jack Ha
b2ca8565c9
CURA-4606 fix startup crash
2018-02-20 13:02:39 +01:00
Jack Ha
3619f5aef3
CURA-4606 update initial materials menu
2018-02-20 11:57:05 +01:00
Jack Ha
c76995c926
CURA-4606 update quality profiles model with field LayerHeightWithoutUnitRole
2018-02-20 11:39:59 +01:00
Jack Ha
a2f3cdc0be
Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager
2018-02-20 11:36:59 +01:00
Jack Ha
605043235a
CURA-4606 fixed create profile from profile context menu
2018-02-20 11:36:51 +01:00
Ian Paschal
f6ff6fdcba
Merge pull request #3364 from Ultimaker/CURA-4790-lighter-weights
...
Cura 4790 lighter weights
2018-02-20 11:27:08 +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
6b34f080ad
Merge branch 'master' of https://github.com/Ultimaker/Cura
2018-02-20 11:12:21 +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
Ian Paschal
1bdd50e17f
CURA-4790 Removed "bold" property
2018-02-20 11:04:23 +01:00
Ian Paschal
c7f8044a32
CURA-4790 Changed light weights back to normal
2018-02-20 10:46:01 +01:00
Jack Ha
21c4753443
CURA-4606 fallback value for layer height must come from definition
2018-02-20 09:54:22 +01:00
Ian Paschal
481858c1b4
Merge pull request #3360 from Ultimaker/CURA-4790-lighter-weights
...
CURA-4790 Added weight properties to theme
2018-02-20 09:40:37 +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
Lipu Fei
27f7d16a57
WIP: Make import/export profile work
2018-02-19 21:47:12 +01:00
Lipu Fei
5bb6efcb3e
WIP: Cleanup MachineManager
2018-02-19 21:20:10 +01:00
