Jaime van Kessel
fe18e73e5b
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent
2019-09-19 16:47:14 +02:00
Jaime van Kessel
fc67090a2f
Fix crash when adding UMO
2019-09-19 16:15:00 +02:00
Jaime van Kessel
7dcf083991
Fix container tree for printers that have no variants but do have qualities & materials
...
CURA-6775
2019-09-19 15:56:06 +02:00
Lipu Fei
5690f61d40
Merge pull request #6269 from Ultimaker/feature_intent_container_tree
...
Container tree structure
2019-09-19 15:51:21 +02:00
maukcc
a1d8fd8743
HMS434 quality deleted
...
HMS434 quality deleted in favor of .package types
2019-09-19 15:35:58 +02:00
Jaime van Kessel
7016e791c8
Fix containertree for machines without materials but with specific qualities
...
CURA-6775
2019-09-19 15:33:19 +02:00
Lipu Fei
c661f82756
Recreate bindings for the text fields
...
CURA-6690
2019-09-19 15:33:10 +02:00
Jaime van Kessel
830b22e381
Fix crash when adding a machine without materials
...
CURA-6775
2019-09-19 15:12:29 +02:00
Jaime van Kessel
2b4144386f
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree
2019-09-19 14:56:12 +02:00
Jaime van Kessel
3e474c1107
Ensure that enabling & disabling an extruder gets handled correctly
...
CURA-6775
2019-09-19 14:54:58 +02:00
Nino van Hooff
c43cdb5c63
Implement allowPositive for printhead settings
...
CURA-6690
2019-09-19 14:49:18 +02:00
Lipu Fei
a3263da3f4
Merge pull request #6338 from Ultimaker/feature_intent_upgrade
...
Feature intent upgrade
2019-09-19 14:44:52 +02:00
Lipu Fei
472e6e88c3
Fix typing
2019-09-19 14:39:03 +02:00
Lipu Fei
6e625b2cf8
Fix typing
2019-09-19 14:34:52 +02:00
Jaime van Kessel
3730ea247d
Ensure that intent gets updated when changing quality / material
...
CURA-6775
2019-09-19 14:26:18 +02:00
Lipu Fei
d8b59c4471
Fix renamed um2 nozzles
...
CURA-6599
2019-09-19 14:26:01 +02:00
Lipu Fei
823f7e5921
Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade
2019-09-19 14:14:29 +02:00
Nino van Hooff
17a832f52f
Do not transform negative printhead min max values to positive while
...
displaying
CURA-6690
2019-09-19 13:56:37 +02:00
Jaime van Kessel
c76c183c6b
Remove unused code
2019-09-19 13:45:13 +02:00
Ghostkeeper
8b8429d629
Merge branch 'CURA--6683_icons_per_object_settings'
2019-09-19 10:48:23 +02:00
Ghostkeeper
1f7c653368
Capitalise the S
...
We need to seize this opportunity and capitalise on that sort of market opportunity.
2019-09-19 10:47:16 +02:00
Jaime van Kessel
884a3ea819
Fix selection for intents if only one of the extruders has an intent
...
CURA-6598
2019-09-19 09:54:47 +02:00
Jaime van Kessel
49276db073
Fix display of intent in profile selection
...
CURA-6598
2019-09-19 09:39:52 +02:00
Jaime van Kessel
cc65bc8213
Fix scrollbar for object selector
2019-09-18 17:05:00 +02:00
Jaime van Kessel
78ab218cc2
No longer reset to default intent when configuration changed
...
This caused the intent to be reset every time a change was made.
CURA-6600
2019-09-18 14:52:51 +02:00
Jaime van Kessel
ede007b860
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree
2019-09-18 14:39:30 +02:00
Jaime van Kessel
7693de325a
Add loggin when user tries to change intent
...
CURA-6598
2019-09-18 14:39:06 +02:00
Ghostkeeper
05de920c21
Once more with feeling
...
Sorry, I didn't see the other review comment until after I pushed the previous commit.
Contributes to issue CURA-6600.
2019-09-18 14:28:22 +02:00
Ghostkeeper
a3e9316f48
Rename all_root_materials to all_base_files
...
This naming is more consistent with the naming of the metadata entry and most of the other code.
Contributes to issue CURA-6600.
2019-09-18 14:27:04 +02:00
Jaime van Kessel
84e5114566
Fix minor review comments
...
CURA-6598
2019-09-18 14:17:26 +02:00
Jaime van Kessel
fade8d3644
No longer make border width hardcoded
...
CURA-6598
2019-09-18 14:10:52 +02:00
Ghostkeeper
2571f54d3c
Simplify looping over quality groups
...
Contributes to issue CURA-6600.
2019-09-18 14:01:23 +02:00
Nino van Hooff
53ea6ce1a7
POS: Fix: currentMeshType reference
...
CURA-6683
2019-09-18 11:39:58 +02:00
Jaime van Kessel
549eb21a5a
Simplify the machinesettings qml
2019-09-18 11:24:11 +02:00
Nino van Hooff
9fa2b26897
Styling: do not use thick_lining for selected tool icons.
...
Affects Per Object Settings and rotate Lay Flat
CURA-6683
2019-09-18 11:23:10 +02:00
Nino van Hooff
7d66409494
POS: Refactor settings dialog into its own file
...
CURA-6683
2019-09-18 11:23:10 +02:00
Nino van Hooff
fbba39cb63
POS: Correct label text
...
CURA-6683
2019-09-18 11:21:12 +02:00
Nino van Hooff
be7bd59e30
Code Style: camelCase for qnl properties, brackets, commas
...
CURA-6683
2019-09-18 11:21:12 +02:00
Nino van Hooff
c3bbd884b5
Use Cura.SecondaryButton for POS select settings button per design
...
CURA-6683
2019-09-18 11:07:18 +02:00
Jaime van Kessel
75c7a6fa62
Change default font for numericTextfield to default instead of medium
2019-09-18 10:55:18 +02:00
Jaime van Kessel
db0428ceec
Remove anchors that were causing qml warnings
2019-09-18 10:32:47 +02:00
Ghostkeeper
b460ffeb9b
Use removeMaterial from MaterialManagementModel
...
Contributes to issue CURA-6600.
2019-09-17 17:59:50 +02:00
Ghostkeeper
8710bb77a7
Use MaterialManagementModel to rename materials
...
It's the replacement for the deprecation.
Contributes to issue CURA-6600.
2019-09-17 17:57:32 +02:00
Ghostkeeper
9392a3553c
Use implementation from MaterialManagementModel
...
The material manager is deprecated now.
Contributes to issue CURA-6600.
2019-09-17 17:54:26 +02:00
Ghostkeeper
0eb3c5c0d6
Refer material manager functions through to material management model
...
That's where the materials are duplicated now. So we only maintain one implementation of that.
Contributes to issue CURA-6600.
2019-09-17 17:50:38 +02:00
Ghostkeeper
963f5e6dd7
Use getApproximateMaterialDiameter rather than getCompatibleMaterialDiameter
...
Should we deprecate getCompatibleMaterialDiameter? I don't think the un-rounded diameter should ever be used for compatibility checks.
Contributes to issue CURA-6600.
2019-09-17 17:03:05 +02:00
Ghostkeeper
80e79f6e7e
Remove TODO
...
Was done in previous commit, but I already pushed so no more --amend now.
Contributes to issue CURA-6600.
2019-09-17 16:58:12 +02:00
Ghostkeeper
fc679758ef
Optimise getting intent categories
...
It's in the container tree, so there's no need for separate queries to the container registry.
Contributes to issue CURA-6600.
2019-09-17 16:57:16 +02:00
Ghostkeeper
3712f9c1f8
Correct parameter name
...
It's the base file, not the ID.
Contributes to issue CURA-6600.
2019-09-17 16:56:00 +02:00
maukcc
b5ba673ffb
HMS434 quality updates 2
2019-09-17 16:51:35 +02:00