Commit graph

21759 commits

Author SHA1 Message Date
Jaime van Kessel
11c23b4fe9 Add first draft of the radiocheckbar
CURA-6598
2019-08-29 11:40:02 +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
trouch
f486f83433 add Ender-5 Plus and CR-10 Max nozzle variants 2019-08-28 15:09:48 +02:00
trouch
925c7cd777 make Ender-5 Plus and CR-10 Max visible 2019-08-28 15:04:17 +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
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
Lipu Fei
bc4809d8f8 Fix metadata checking 2019-08-28 11:52:52 +02:00
Ghostkeeper
c9191beb61
Fix updating intents list when printer changes
Contributes to issue CURA-6600.
2019-08-28 11:11:13 +02:00
Ian Paschal
60c7a3d3b7
Merge pull request #6270 from Ultimaker/CS-190_add_s3_image
Add Ultimaker S3 image
2019-08-28 11:01:57 +02:00
Ian Paschal
830078b9d5 Add Ultimaker S3 image
Contributes to CS-190
2019-08-28 10:51:40 +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
b2cee850c9
Use container tree to find current available quality groups
Contributes to issue CURA-6600.
2019-08-28 08:58:03 +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
Ghostkeeper
21412986d3
Remove material manager from MaterialsPage
It is no longer used now that everything relevant has been moved to a separate class for this page specifically.

Contributes to issue CURA-6600.
2019-08-27 18:01:35 +02:00
Remco Burema
ec6903d34f Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-08-27 17:57:25 +02:00