43 Commits

Author	SHA1	Message	Date
Ghostkeeper	5f4051ab5c	Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter ... There was a function to round it for us already. Contributes to issue CURA-6600.	2019-09-17 16:41:32 +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	f4dc93fc39	Prevent crash in model if no extruder is set ... CURA-6598	2019-08-29 11:57:03 +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
Remco Burema	745390e51f	Fix typing. ... part CURA-6600	2019-08-27 17:57:11 +02:00
Ghostkeeper	63ae6ee9ec	Fix updating materials models when materials change before first printer switch ... Otherwise the _extruder_stack field would not yet be set. Contributes to issue CURA-6600.	2019-08-27 15:47:41 +02:00
Jaime van Kessel	72ea1257d7	Prevent crash when machine isn't configured correctly yet ... CURA-6600	2019-08-27 13:50:12 +02:00
Ghostkeeper	1febfde3cc	Fix switching to printers without variant ... Since the 'empty_variant' nozzle is now just in the tree, this check is no longer even necessary. Contributes to issue CURA-6600.	2019-08-23 15:38:58 +02:00
Ghostkeeper	4fb656ea7b	Don't use deprecated Preferences.getInstance() ... Contributes to issue CURA-6600.	2019-08-23 14:46:42 +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	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	47d082b5dc	Fix updating of material models ... CURA-6600	2019-08-21 09:42:49 +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
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
Jaime van Kessel	41f2a0e222	Add a property to temporarily disable the material models from updating. ... This allows the QMl to stop the updating when it's not even visible	2019-02-21 20:47:38 +01:00
Jaime van Kessel	7754b8a447	Only instantiate setting menus when it's visible ... This saves a bit of time on booting and prevents unneeded updates ( because it doesn't matter if a setting changes if no-one is watching!)	2019-02-21 20:20:01 +01:00
Ghostkeeper	66ed9ed201	Remove optimisation that broke updates of models upon metadata change ... If the metadata changed, such as whether a material was favourite or not, then the materials models were not updating any more because the actual list of available materials was still the same. I've removed this optimisation and tested performance locally. It seems to be slightly slower (though that might be placebo or measurement error). However most of the performance boost of cura-6016 was resulting from different changes there so the interface still seems to be quite a lot faster than what it used to be. Contributes to issue CURA-6032.	2018-12-18 16:52:04 +01:00
Remco Burema	b413b4cdb6	Correct a typo in typing. [CURA-6016]	2018-12-11 17:21:14 +01:00
Jaime van Kessel	f67ac8d7c4	Update far less agressively for the material models ... CURA-6016	2018-12-11 10:59:17 +01:00
Lipu Fei	97e6354c13	Fix material update upon extruder-compatible diameter change ... CURA-5834 Material models and the material container on an extruder need to be updated when the extruder's compatible diameter gets changes.	2018-10-19 13:48:52 +02:00
Ghostkeeper	c6fa9474d6	Merge branch '3.5'	2018-09-17 14:41:45 +02:00
Diego Prado Gesto	6d2492e5cb	Remove spurious signal, it does the same as materialsUpdated. ... Contributes to CURA-5682.	2018-09-12 12:59:13 +02:00
Jaime van Kessel	e7d9f0ce45	Added typing for various setting classes	2018-09-10 15:24:11 +02:00
Lipu Fei	40c4e9c5df	Fix KeyError color_code in BaseMaterialsModel	2018-08-28 09:56:00 +02:00
Lipu Fei	33f495442a	Remove unneeded code ... CURA-5162	2018-08-27 10:44:41 +02:00
Ian Paschal	2304aeaceb	Expanded states preserved when updating models ... Did this so that models can be updated more often fixing bugs where when a material is set as "not favorite" in the favorites section, its updated accordingly in its "normal" section. It's also the ground work for saving material section expansion to preferences. Contributes to CURA-5378	2018-08-24 12:10:32 +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
Ian Paschal	68bccd8bf7	Improve the Favorites, Base, and Brand materials models (WIP) ... Contribuetes to CURA-5378	2018-08-20 17:16:54 +02:00
Diego Prado Gesto	a4b46be2c5	CURA-5427 Force the material models to update when the machine changes and so ... when the extruder stack changes. - What happen was that when the extruder model needed to update, the material model was not updated correctly and so when changing a material, the node was incorrect.	2018-06-01 12:58:08 +02:00
Lipu Fei	6cae5c2e35	Remove unnecessary signal connection in MaterialsModel ... CURA-5052	2018-03-07 10:39:23 +01:00
Lipu Fei	cb7677347d	Fix material model update upon variant change ... CURA-5052	2018-03-06 15:27:05 +01:00
Lipu Fei	4b7c8a8a80	Add doc for BaseMaterialsModel	2018-03-01 15:09:58 +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