Ghostkeeper
94eb76a844
Merge branch 'master' into CURA-6793_performance
...
Conflicts:
cura/Machines/MaterialManager.py -> File was deleted in Master but I changed things for the lazy loading.
cura/Machines/Models/BaseMaterialsModel.py -> I clarified documentation on a line above a place where a timer was added in between.
Contributes to issue CURA-6793.
2019-10-23 09:58:08 +02:00
Lipu Fei
5602c71ec7
Fix material model update and signal recursion
...
CURA-6904
2019-10-21 09:53:14 +02:00
Ghostkeeper
7348c70af6
Don't get whole container to just get metadata
...
A performance improvement, especially in the material models.
Contributes to issue CURA-6793.
2019-10-16 13:56:23 +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
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
646222f2ac
Fix removing of material
...
CURA-6600
2019-08-19 13:01:05 +02:00
Ghostkeeper
7d1f8e981b
Fix models using new MaterialNode class
...
The new one doesn't have getMetadata. Maybe we should allow it to have that actually.
Contributes to issue CURA-6600.
2019-08-13 17:20:58 +02:00
Lipu Fei
4a171eebf6
Move models around again
...
- Move machine related models to cura.Machines.Models
- Move printer device related models to cura.PrinterOutput.Models
- Other UI/GUI related modules in cura.UI
2019-03-26 08:29:22 +01:00
Lipu Fei
4078719c58
Move cura.Machine.Models to cura.UI.MachineModels
2019-03-20 09:56:11 +01:00
Jaime van Kessel
f67ac8d7c4
Update far less agressively for the material models
...
CURA-6016
2018-12-11 10:59:17 +01:00
Jaime van Kessel
e7d9f0ce45
Added typing for various setting classes
2018-09-10 15:24:11 +02:00
Ian Paschal
6be9b5e27f
Consolidate models some more
...
Contributes to CURA-5162, CURA-5378
2018-08-23 16:58:23 +02:00
Ian Paschal
56a5f59964
Cleaner code
...
I was hoping to completely nix the generic materials model (since it's basically just a brand "Generic", but then in the QML it has to be have the same in terms of sub-menus or fold-outs and that looked stupid (Generic -> ABS -> ABS)). So we keep that one for now. It is cleaner though.
Contributes to CURA-5162, CURA-5378
2018-08-23 16:39:40 +02:00
Ian Paschal
6225fff1f8
Re-added material detail view
...
Contributes to CURA-5378
2018-08-22 15:58:58 +02:00
Ian Paschal
cb713eea6a
Improve models
...
Contributes to CURA-5162, CURA-5378
2018-08-22 12:33:29 +02:00
Lipu Fei
76417b7fb2
Hide materials belong to a to-be-removed package
2018-07-11 10:57:57 +02:00
Lipu Fei
7eba73adc5
Handle excluded_materials in getAvailableMaterials()
...
CURA-5223
Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
2018-04-12 16:12:07 +02:00
Aleksei S
2240c38fd7
Exclude HIPS and PETG material for UM
...
CURA-5149
2018-03-26 17:11:38 +02:00
Lipu Fei
80c2b3b7e8
Use set for searching
...
CURA-5149
2018-03-26 14:40:25 +02:00
Lipu Fei
5b36b4fb84
Check for Ultimaker printers based on manufacturer
...
CURA-5149
2018-03-26 14:40:25 +02:00
Aleksei S
767789d394
Filter generic list for Ultimaker printers.
...
CURA-5149
2018-03-26 13:51:37 +02:00
Ghostkeeper
9f89678e42
Update when switching printers
...
I confused globalContainerChanged with activeStackChanged.
Contributes to issue CURA-4606.
2018-03-14 08:26:12 +01:00
Ghostkeeper
5afcf2beac
Don't update brand and generic materials models upon switching active extruder
...
Because the list of materials can't change by that action.
Contributes to issue CURA-4606.
2018-03-12 16:28:41 +01:00
Ghostkeeper
bb7fccbd48
Add logging for every setting model update
...
You can clearly see that some models are updated 4 times or so now.
Contributes to issue CURA-4606.
2018-03-12 14:48:56 +01:00
Ghostkeeper
d8853b8a98
Sort profile models case-insensitively
...
Cast every sorting key to uppercase before doing this. Don't cast to lowercase or there will be problems with characters that don't have lowercase and with Turkish dotted i vs. undotted i.
Fixes #3460 .
2018-03-09 11:40:33 +01:00
Lipu Fei
844a597e08
Fix materials models
2018-03-02 09:28:25 +01:00
Lipu Fei
d6f6dbe45e
Rename to available_material_dict
2018-03-01 15:12:34 +01:00
Lipu Fei
b4c3536999
Move getAvailableMaterials() into MaterialManager
2018-03-01 15:02:57 +01:00
Lipu Fei
c21174eea8
Fix the usage of protected variables in material models
2018-03-01 11:55:29 +01:00
Lipu Fei
580244a546
Split material models into separate files
2018-03-01 11:50:55 +01:00
