GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 08:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,715 Commits 295 Branches 268 Tags
Commit Graph

20715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
d06ce211ff
Document new requirement that there must always be one child 
Contributes to issue CURA-6600.
 2019-08-22 16:47:57 +02:00
Ghostkeeper
46cf7aafa9
Encode empty containers in container tree if necessary 
You can now be assured that there is ALWAYS at least one child node, except for child nodes of intent profiles which don't exist.

Contributes to issue CURA-6600.
 2019-08-22 16:44:52 +02:00
Ghostkeeper
81a33af3aa
Use variant node's preferredMaterial function from MaterialManager too 
We can reuse that code.

Contributes to issue CURA-6600.
 2019-08-22 15:46:29 +02:00
Ghostkeeper
0302ae4257
Don't find any variants if the machine says it doesn't have them 
Even if there might be a matching variant...

Contributes to issue CURA-6600.
 2019-08-22 15:44:41 +02:00
Ghostkeeper
999e19940e
Also don't add any materials added later if there are no materials 
Keeps it consistent.

Contributes to issue CURA-6600.
 2019-08-22 15:43:16 +02:00
Ghostkeeper
6f77c8735c
Don't load any materials for printers that don't have them 
For instance the Ultimaker 2 shouldn't display any materials.

Contributes to issue CURA-6600.
 2019-08-22 15:37:05 +02:00
Ghostkeeper
295ad564c0
Add function to find preferred material for configuration of printer/nozzle 
This is supposed to replace the material manager's getDefaultMaterial function.

Contributes to issue CURA-6600.
 2019-08-22 15:34:24 +02:00
Ghostkeeper
7b83e51439
Use container tree to determine default material 
Using the new architecture here.

Contributes to issue CURA-6600.
 2019-08-22 15:04:20 +02:00
Ghostkeeper
8ef410e826
Update the _available_materials in the actual _update function 
It's confusing that this would be updated in the _canUpdate function. Just cleanliness.

Contributes to issue CURA-6600.
 2019-08-22 09:25:26 +02:00
Ghostkeeper
ea1c99b708
Update _favorite_ids in BaseMaterialsModel._update 
And make all subclasses run its super _update as well to make sure that this gets updated for them. It's necessary for the _createMaterialItem functionality because it needs to add an is_favorite role.

Contributes to issue CURA-6600.
 2019-08-22 09:25:26 +02:00
Ghostkeeper
5d76f96354
Fix getting available materials without material manager 
It's a bit weird still that this is executed in the _canUpdate... Oh well.

Contributes to issue CURA-6600.
 2019-08-22 09:25:26 +02:00
Ghostkeeper
4ad6f4f635
Update materials models when container tree updates 
Instead of relying on MaterialManager to do this.

Contributes to issue CURA-6600.
 2019-08-22 09:25:25 +02:00
Ghostkeeper
6c6dd0efad
Add signals to signal that a material got changed or removed 
The material models need to know this.

Contributes to issue CURA-6600.
 2019-08-22 09:25:25 +02:00
Ghostkeeper
b7213ad020
Don't require material manager any more to find available materials 
We have our container tree for that.

Contributes to issue CURA-6600.
 2019-08-22 09:25:17 +02:00
Jaime van Kessel
e7609fadf4 Deprecated the allActiveMaterialIds and replaced the single location where it was used 
CURA-6600
 2019-08-21 17:08:35 +02:00
Jaime van Kessel
7979fcd633 Fix warnings in the settings menu 
CURA-6600
 2019-08-21 17:07:58 +02:00
Jaime van Kessel
f6ccd40f9f Add tests for metadatachanged 
CURA-6600
 2019-08-21 15:18:57 +02:00
Jaime van Kessel
25ea1dd66a Add tests for the _onRemoved handler 
CURA-6600
 2019-08-21 14:45:59 +02:00
Jaime van Kessel
a6be5ac52d Fix materialNode tests 
CURA-6600
 2019-08-21 12:50:40 +02:00
Jaime van Kessel
80dd8a0061 Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-21 09:43:04 +02:00
Jaime van Kessel
47d082b5dc Fix updating of material models 
CURA-6600
 2019-08-21 09:42:49 +02:00
Remco Burema
507cb356d2 Remove (all?, most?) deprecated ContainerNode.getMetaDataEntry calls. 
part of CURA-6600
 2019-08-20 15:38:45 +02:00
Jaime van Kessel
b5d826fab9 Fix deprecation warning 
CURA-6600
 2019-08-20 14:49:47 +02:00
Remco Burema
5039d8db05 Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-08-20 13:53:12 +02:00
Ghostkeeper
46b489c3f9
getAvailableMaterialsForMachineExtruder can never return None 
So no need to check for it.

Contributes to issue CURA-6600.
 2019-08-19 17:32:39 +02:00
Ghostkeeper
5abb03e269
No longer update all material models when favourites change 
The MaterialManager.materialsUpdated signal was only called once upon init and for the rest when a favourite was added or removed. So only the FavoriteMaterialsModel would need to listen to it.
Because the MaterialManager is being deprecated, the favourite materials model now just listens to the preferences changing instead, as it was supposed to be doing anyway.

Contributes to issue CURA-6600.
 2019-08-19 17:09:16 +02:00
Ghostkeeper
dcf7ed9969
Fix finding materials by GUID 
See, I made the mistake again.

Contributes to issue CURA-6600.
 2019-08-19 16:38:59 +02:00
Ghostkeeper
04c53c7190
Fix connecting to metadata changes 
Otherwise the number of parameters is wrong.

Contributes to issue CURA-6600.
 2019-08-19 16:24:27 +02:00
Ghostkeeper
10dbf3f735
Fix getting GUID from metadata 
I keep making this mistake. A donkey may not hit its leg twice on the same stone, but I ain't no ass.

Contributes to issue CURA-6600.
 2019-08-19 16:24:00 +02:00
Ghostkeeper
443495973f
Don't use deprecated material manager any more 
Contributes to issue CURA-6600.
 2019-08-19 16:16:28 +02:00
Ghostkeeper
ae7c717636
Re-implement getLinkedMaterials without material manager 
Contributes to issue CURA-6600.
 2019-08-19 15:40:29 +02:00
Ghostkeeper
b0e6bb4bc9
Update documentation for getLinkedMaterials 
Contributes to issue CURA-6600.
 2019-08-19 15:33:07 +02:00
Ghostkeeper
30b2f943fd
Update material node when its metadata changes 
This should keep the tree up to date if anything is added, removed or changed in the container registry.

Contributes to issue CURA-6600.
 2019-08-19 15:13:19 +02:00
Ghostkeeper
41c573b087
Fix filtering by GUID 
Get the correct metadata entry, please.

Contributes to issue CURA-6600.
 2019-08-19 15:06:02 +02:00
Ghostkeeper
38937d8ac4
Remove material node when material is deleted 
Contributes to issue CURA-6600.
 2019-08-19 14:47:08 +02:00
Jaime van Kessel
4ff8991196 Ensure that materials get filtered by diameter again 
CURA-6600
 2019-08-19 14:10:36 +02:00
Jaime van Kessel
d29b3078b3 Clean up no longer used code 
CURA-6600
 2019-08-19 13:15:38 +02:00
Jaime van Kessel
fcbfa88d97 Fix creation of new materials 
CURA-6600
 2019-08-19 13:13:08 +02:00
Jaime van Kessel
88857a7be8 Fix setMaterialName 
CURA-6600
 2019-08-19 13:06:09 +02:00
Jaime van Kessel
646222f2ac Fix removing of material 
CURA-6600
 2019-08-19 13:01:05 +02:00
Jaime van Kessel
49e8c8d9d9 Fix the check to see if a material can be removed 
CURA-6600
 2019-08-19 12:52:31 +02:00
Jaime van Kessel
8759aae73e Fix crash when materialManager could not be converted to QObject 
No idea why this was causing issues, but this should also be a bit faster.

CURA-6600
 2019-08-19 12:47:07 +02:00
Jaime van Kessel
2417705dfd Prevent crashes when duplicating a material 
CURA-6600
 2019-08-19 11:42:52 +02:00
Jaime van Kessel
dc26f98a3a Fix import issue 
CURA-6600
 2019-08-19 11:30:04 +02:00
Jaime van Kessel
76b58134ae Fix getRootMaterialIdForDiameter 
CURA-6600
 2019-08-19 11:07:35 +02:00
Jaime van Kessel
4dd5cb1a85 Fix getMaterialByType 
CURA-6600
 2019-08-19 09:44:39 +02:00
Ghostkeeper
80baeb9873
Remove _added functions for nodes that can't be added during runtime 
Among the machines, variants, materials, qualities and intents, only machines and materials can ever be added during runtime. For the rest, we don't need to listen to these signals.

Contributes to issue CURA-6600.
 2019-08-16 16:28:42 +02:00
Jaime van Kessel
97e77994a1 Update the removing & duplicating of material 
CURA-6600
 2019-08-16 10:55:12 +02:00
Jaime van Kessel
8d05ebef9d Fix crash on adding a new printer 
CURA-6600
 2019-08-16 10:24:50 +02:00
Remco Burema
7ed8d0b2f7 Remove deprecated .getMetadata() call. 
part of CURA-6600
 2019-08-16 09:37:58 +02:00