21225 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	617419ccc6	Use .container property of nodes to switch profiles ... This also fixes a crash when switching nozzles since the variant was set to a list of profiles rather than just one profile. Contributes to issue CURA-6600.	2019-08-23 13:51:24 +02:00
Ghostkeeper	40b562093d	Don't unnecessarily deprecate the getMetaDataEntry functionality ... If possible you should group the metadata queries but otherwise this is still fine to use. Contributes to issue CURA-6600.	2019-08-23 13:43:30 +02:00
Ghostkeeper	99bf82dee3	Fix displaying list of nozzles ... Make it use the ContainerTree structure since the original VariantManager's structure is not populated any more. Contributes to issue CURA-6600.	2019-08-23 13:22:25 +02:00
ChrisTerBeke	c491d7f3e2	Some reformatting	2019-08-23 10:40:17 +02:00
ChrisTerBeke	d674494cdb	Don't look at available configurations when no slots are available	2019-08-23 10:10:44 +02:00
ChrisTerBeke	3578afd4ac	Add support for multiple available configurations via network and cloud	2019-08-22 23:47:07 +02:00
Ghostkeeper	8e06786e7b	Use ContainerTree when updating material upon nozzle switch ... Rather than the material manager which is deprecated. Contributes to issue CURA-6600.	2019-08-22 17:27:39 +02:00
Ghostkeeper	37bd7c6b0e	Always return a MaterialNode from getDefaultMaterial ... Its function is, after all, to find the default. It should always have a default. Sometimes that will be the empty material, but so be it. Contributes to issue CURA-6600.	2019-08-22 17:13:46 +02:00
Ghostkeeper	431c8f4900	Build stack using container tree's preferred material/nozzle ... No need to really implement the fallbacks any more for when there are no materials. Only for when the preferred material can't be found. Contributes to issue CURA-6600.	2019-08-22 17:03:01 +02:00
Ghostkeeper	9bcf2698d5	Log warning when preferred material can't be found ... Contributes to issue CURA-6600.	2019-08-22 17:02:09 +02:00
Ghostkeeper	9dca6c0127	Return empty node if preferred node couldn't be found ... Or any node, really. There must now always be a subnode. Contributes to issue CURA-6600.	2019-08-22 16:52:38 +02:00
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
Lipu Fei	8d8f18d953	Merge pull request #6240 from Ultimaker/CURA-6732_available_configurations ... Cura 6732 available configurations	2019-08-22 16:03:46 +02:00
Jaime van Kessel	bc4b2a596a	Rename _printer_configuration to _active_printer_configuration ... CURA-6732	2019-08-22 15:58:12 +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
Jaime van Kessel	a1ca705de9	Add documentation ... CURA-6732	2019-08-22 15:10:17 +02:00
Jaime van Kessel	5cb485d4d3	Only emit uniqueConfigurationsChanged signal if the set changed ... CURA-6732	2019-08-22 15:07:57 +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
Jaime van Kessel	1e2f5ddecd	Add test for unique printer configuration ... CURA-6732	2019-08-22 14:53:13 +02:00
Jaime van Kessel	89260891e6	Add tests for the available configurations ... CURA-6732	2019-08-22 14:32:33 +02:00
Jaime van Kessel	34c3a04744	Added missing tests for peripheral ... Not part of the ticket, but I'm boyscouting this.	2019-08-22 14:24:19 +02:00
Jaime van Kessel	73c6676673	Added missing test for camera URL	2019-08-22 14:17:40 +02:00
Jaime van Kessel	561a3e53e5	Only add available configuration if it wasn't already in the list ... CURA-6732	2019-08-22 14:09:39 +02:00
Jaime van Kessel	d1720db5ad	Ensure that the available configurations are also used in the uniqueConfigurations ... CURA-6372	2019-08-22 14:07:44 +02:00
Jaime van Kessel	d2e9715409	Add availableConfiguration property to the output model ... CURA-6732	2019-08-22 14:02:29 +02:00
Ghostkeeper	7ccf46124f	Give warning when build plate temperature is below volume temperature ... It's not going to become lower than the ambient temperature after all.	2019-08-22 13:37:30 +02:00
Ghostkeeper	9f16973215	Don't remove skirt when printing with support ... According to tests by theWaldschrat and Liger0, the skirt is still necessary when support is enabled. Fixes #6229.	2019-08-22 09:46:49 +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
Ghostkeeper	9122d0cca4	Remove misleading text that says you could enter hostnames ... We don't resolve the hostnames ever. You can only enter IP addresses.	2019-08-21 09:56:32 +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
ChrisTerBeke	a179d7118d	Fix renaming mistake from 1fa5628cb2e35425d1b42f9dbb20a9bda45da032	2019-08-20 17:17:52 +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