Commit graph

6608 commits

Author SHA1 Message Date
Ghostkeeper
7216a1dbd7
Refer through to correct function of QualityManagementModel
Contributes to issue CURA-6600.
2019-09-02 17:52:30 +02:00
Ghostkeeper
4043afd09f
Refer _createQualityChanges through to QualityManagementModel
That's where the function was moved.
This function is still being called from various places, even though it's protected. Should change that...

Contributes to issue CURA-6600.
2019-09-02 17:47:31 +02:00
Ghostkeeper
a1e6ba615c
Don't use isinstance to check for extruder stack vs. global
Just use the metadata available.

Contributes to issue CURA-6600.
2019-09-02 17:44:28 +02:00
Ghostkeeper
297b430712
Fix getting container registry
It's not in the fields of this class.

Contributes to issue CURA-6600.
2019-09-02 17:42:17 +02:00
Ghostkeeper
b5d32a9b70
Move createQualityChanges function to QualityManagementModel
This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless).

Contributes to issue CURA-6600.
2019-09-02 17:07:18 +02:00
Ghostkeeper
b05de3e6d8
Remove unused import
Contributes to issue CURA-6600.
2019-09-02 16:48:01 +02:00
Ghostkeeper
1c81174baf
Fix crashing upon creating QualityManagementModel and MaterialManagementModel
The C++ object should be kept alive in QML.

Contributes to issue CURA-6600.
2019-09-02 16:47:35 +02:00
Remco Burema
b97015a354 Added 'align selected face with buildplate' feature.
Alt-click to select a face. See the (identically named) 'feature_bottom_face' branch in Uranium for more indepth information.
2019-09-02 00:17:14 +02:00
Jaime van Kessel
3fa2fefdef Merge branch 'CURA-6643_f5_to_reload_gcode' of github.com:Ultimaker/Cura 2019-08-30 11:39:41 +02:00
Jaime van Kessel
3b321cd9e1 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:33:12 +02:00
Jaime van Kessel
f7d61e1e24 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-29 16:31:44 +02:00
Jaime van Kessel
317052e636 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-08-29 16:31:13 +02:00
Jaime van Kessel
b00b8c8c58 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface 2019-08-29 16:28:26 +02:00
Jaime van Kessel
d548404dfd Fix typing issues 2019-08-29 16:23:10 +02:00
Jaime van Kessel
04997fca7f Add property for active intent category
CURA-6598
2019-08-29 15:52:02 +02:00
Jaime van Kessel
de1065f0a3 Prevent crash if extruder is not yet set
CURA-6598
2019-08-29 14:04:05 +02:00
Jaime van Kessel
ba0c16d968 Update intents model to use container tree
CURA-6598
2019-08-29 13:53:23 +02:00
Jaime van Kessel
a8b818fbdc Ensure that right intents are added to the tree
CURA-6598
2019-08-29 13:52:01 +02:00
Jaime van Kessel
f4dc93fc39 Prevent crash in model if no extruder is set
CURA-6598
2019-08-29 11:57:03 +02:00
Jaime van Kessel
5401a4db15 Ensure that each intent gets it's own bar in recommended
CURA-6598
2019-08-29 11:53:19 +02:00
Jaime van Kessel
24d6d5b102 Update intent models to also house nested qualities
CURA-6598
2019-08-29 11:45:19 +02:00
Jaime van Kessel
845c2d41ad Merge branch 'master' of github.com:Ultimaker/Cura 2019-08-29 11:26:14 +02:00
Jaime van Kessel
0cfaac3940 Set the BuildVolume node to disabled
This prevents accidental modification of the node
2019-08-29 11:23:01 +02:00
Ghostkeeper
2676c7fa2f
Fix getting container metadata when switching to quality changes profile
Contributes to issue CURA-6600.
2019-08-29 09:03:04 +02:00
Ghostkeeper
9614cef135
Move duplicateQualityChanges to QualityManagementModel
This is specific to the quality management page, so moving it here prevents QualityManager from becoming a big ball of spaghetti again.

Contributes to issue CURA-6600.
2019-08-29 09:02:18 +02:00
Ghostkeeper
b046ff6683
Fix updating quality management page profile list
When a custom profile gets added, deleted or renamed we need to update our model.

Contributes to issue CURA-6600.
2019-08-28 16:54:41 +02:00
Ghostkeeper
a7e5830762
Fix case if containers are None
This happens when the number of containers was resized.

Contributes to issue CURA-6600.
2019-08-28 16:50:14 +02:00
Ghostkeeper
2647b7e994
Fix latent querying for node_for_global on quality changes
There are no quality changes nodes any more so this all has to happen through metadata.

Contributes to issue CURA-6600.
2019-08-28 16:44:10 +02:00
Ghostkeeper
5d8fff69e4
Fix referencing nodes for quality changes
Contributes to issue CURA-6600.
2019-08-28 16:32:20 +02:00
Ghostkeeper
5fadc7019d
Move renameQualityChangesGroup to QualityManagementModel
Contributes to issue CURA-6600.
2019-08-28 16:31:50 +02:00
Ghostkeeper
be49956de9
Refer to quality management model to remove quality changes
This function is deprecated now.

Contributes to issue CURA-6600.
2019-08-28 15:29:03 +02:00
Ghostkeeper
b3fd310d37
Move removeQualityChangesGroup to QualityManagementModel
This is an operation specific to the quality management page, so it should be located there.

Contributes to issue CURA-6600.
2019-08-28 15:21:33 +02:00
Ghostkeeper
b9370f864e
Get quality definition from container tree
Contributes to issue CURA-6600.
2019-08-28 14:34:00 +02:00
Ghostkeeper
35907e5228
Use Pythonic way of creating list of N elements
Contributes to issue CURA-6600.
2019-08-28 14:17:17 +02:00
Ghostkeeper
619adcb5b3
Fix handling quality_changes_group by metadata
We only need to access the metadata so this is fine.

Contributes to issue CURA-6600.
2019-08-28 14:07:49 +02:00
Ghostkeeper
7c90b5dd30
Use shortcut to get current quality changes groups
Contributes to issue CURA-6600.
2019-08-28 13:56:37 +02:00
Ghostkeeper
ae77f9124c
Use container tree to determine quality_definition of profile and printer
To see if they match.

Contributes to issue CURA-6600.
2019-08-28 13:55:11 +02:00
Ghostkeeper
24fd67c360
Also try looking for material-specific profiles, not just by type
Type is only a fallback after the exact ID match.
This way we can also have profiles specific to Ultimaker PLA Red and such in the future.

Contributes to issue CURA-6600.
2019-08-28 13:53:21 +02:00
Ghostkeeper
a05f077df8
Use fdmprinter for machines that don't have printer-specific qualities
This encodes the behaviour of QualityManager.getMachineDefinitionIDForQualitySearch.

Contributes to issue CURA-6600.
2019-08-28 13:35:49 +02:00
Ghostkeeper
61e13087cd
Fix testing for available quality types
Contributes to issue CURA-6600.
2019-08-28 13:26:18 +02:00
Ghostkeeper
6dd0333626
Use container tree instead of getMachineDefinitionIdForQualitySearch
It's in the metadata there, so use it.

Contributes to issue CURA-6600.
2019-08-28 13:21:23 +02:00
Ghostkeeper
5a7054ecc3
Remove references to quality manager
The last two remaining here.

Contributes to issue CURA-6600.
2019-08-28 13:16:39 +02:00
Ghostkeeper
c9191beb61
Fix updating intents list when printer changes
Contributes to issue CURA-6600.
2019-08-28 11:11:13 +02:00
Ghostkeeper
64a8aff627
Remove usage of deprecated getContainer() function
This was the last place where it was used in our code base.

Contributes to issue CURA-6600.
2019-08-28 10:35:56 +02:00
Ghostkeeper
83c8b814d9
Apply intent category when changing to quality changes group
This essentially makes the quality changes depend on the intent that was active when it was created.

Contributes to issue CURA-6600.
2019-08-28 10:33:33 +02:00
Ghostkeeper
4fd886f2e8
Use container tree to get current quality groups
Contributes to issue CURA-6600.
2019-08-28 09:02:26 +02:00
Ghostkeeper
972531b0a6
No longer update upon switching active profile
It's not necessary since our model doesn't depend on that.

Contributes to issue CURA-6600.
2019-08-28 08:49:28 +02:00
Ghostkeeper
944d1090cf
Use ContainerTree to get current quality groups and MachineManager to update
This removes all dependencies from the quality manager.

Contributes to issue CURA-6600.
2019-08-28 08:42:39 +02:00
Ghostkeeper
0398c404fb
Update tree when material gets deleted
Contributes to issue CURA-6600.
2019-08-27 18:01:35 +02:00
Ghostkeeper
f5ca29c7aa
Emit materialsChanged from the variant when a material gets added
This allows the material models to update themselves.

Contributes to issue CURA-6600.
2019-08-27 18:01:35 +02:00