Commit graph

20921 commits

Author SHA1 Message Date
Ghostkeeper
178887d8e5
Add test for getting metadata from machine node
Contributes to issue CURA-6600.
2019-09-06 17:40:31 +02:00
Ghostkeeper
5106d3b7c1
Test if we actually return the result of the call to getQuality[Changes]Groups
Contributes to issue CURA-6600.
2019-09-06 17:26:38 +02:00
Ghostkeeper
7f192ce36f
Add test for getting current quality changes groups
Similar to getting the current quality groups.

Contributes to issue CURA-6600.
2019-09-06 17:25:07 +02:00
Ghostkeeper
ea5530c507
Add test for getting quality changes groups without global stack
Shouldn't crash. Instead it should give no quality changes groups.

Contributes to issue CURA-6600.
2019-09-06 17:21:56 +02:00
Ghostkeeper
8bcd9b339a
Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate
Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder.

Contributes to issue CURA-6600.
2019-09-06 17:20:03 +02:00
Ghostkeeper
4bdc819f12
Fix nondetermistic result with dictionary values list
Because global_stack.extruders.values can be returned in any order, the configurations matching with the lists doesn't always give a result.
It happened to work on my computer with the test, but there is no guarantee of that.

This is probably also going wrong in other places. I don't think we should use the .extruders property anywhere really!

Contributes to issue CURA-6600.
2019-09-06 17:15:45 +02:00
Ghostkeeper
d618f2df71
Add test for getCurrentQualityGroups
The test succeeded but in writing it I discovered a bug. I'll fix that soon.

Contributes to issue CURA-6600.
2019-09-06 17:06:32 +02:00
Ghostkeeper
71b94f6d5b
Create own quality changes profiles instead of asking quality manager
It was a protected function call on a different class anyway, so that should never have gotten accepted.

Contributes to issue CURA-6600.
2019-09-05 17:26:48 +02:00
Ghostkeeper
9a6f76c069
Add typing for get---ManagementModel
Just to have my IDE find usages properly, really.

Contributes to issue CURA-6600.
2019-09-05 16:32:34 +02:00
Remco Burema
16ea437255 Make 3MF-reader aware of setting-version for introduction Intent. 2019-09-04 14:52:54 +02:00
Ghostkeeper
f8472d6414
Fix changing name of profiles in quality changes group
Because quality changes don't have nodes any more.

Contributes to issue CURA-6600.
2019-09-02 18:00:04 +02:00
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
Ghostkeeper
10f37c98ff
Add test for getCurrentQualityGroups if there is no current printer
Contributes to issue CURA-6600.
2019-09-02 13:35:17 +02:00
Jaime van Kessel
d9e94f5019 Fix tests 2019-08-29 17:07:36 +02:00
Jaime van Kessel
784ab6e903 Add missing isDirty function
CURA-6600
2019-08-29 16:36:11 +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
d548404dfd Fix typing issues 2019-08-29 16:23:10 +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
ChrisTerBeke
243d51eb23
Merge pull request #6276 from Ultimaker/network-plugin-material-sync-improvements
Network plugin material and configuration sync improvements
2019-08-28 23:32:36 +02:00
ChrisTerBeke
13e85362b0 Fix typing issues 2019-08-28 23:27:30 +02:00
ChrisTerBeke
7b45100dd0 Ensure we're showing configurations when no available configurations in other extruder 2019-08-28 23:19:23 +02:00
ChrisTerBeke
189d873fc1 Fix typing issue 2019-08-28 22:45:18 +02:00
ChrisTerBeke
5ee6cd7e8f Better handling of error response, not always show message 2019-08-28 22:39:25 +02:00
ChrisTerBeke
8dd6105a00 Remove more weird generated files 2019-08-28 22:20:03 +02:00
ChrisTerBeke
4eaf95e7c8 Remove weird generated file 2019-08-28 22:18:00 +02:00
ChrisTerBeke
47237cda5f Fix syncing materials via API, show nice message 2019-08-28 22:17:39 +02:00
ChrisTerBeke
8dd6dd6573
Merge pull request #6274 from Ultimaker/fix_umnt_material_call
Fix materials API call
2019-08-28 19:20:24 +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
Lipu Fei
6591593f59 Fix materials API call 2019-08-28 15:31:52 +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
ba608c5987
Use container tree to reset quality after deleting packages
Contributes to issue CURA-6600.
2019-08-28 14:57:02 +02:00
Ghostkeeper
b9370f864e
Get quality definition from container tree
Contributes to issue CURA-6600.
2019-08-28 14:34:00 +02:00
Ghostkeeper
f89f47f8d5
Get quality definition from ContainerTree rather than QualityManager
Contributes to issue CURA-6600.
2019-08-28 14:31:07 +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