20671 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Ghostkeeper	46e5bc897f	Fix deprecated getQualityGroups in QualityManager ... It needs to get the actual extruders, not their keys. Contributes to issue CURA-6600.	2019-08-15 17:01:23 +02:00
Ghostkeeper	606bef9b5f	Use ContainerTree structure to get quality groups ... Contributes to issue CURA-6600.	2019-08-15 17:01:23 +02:00
Ghostkeeper	9bcd3d8c1e	Use ContainerTree to get quality groups instead of QualityManager ... Contributes to issue CURA-6600.	2019-08-15 17:01:23 +02:00
Ghostkeeper	d4cd5a7ea5	Add convenience function to get quality groups for current printer ... This is used very often all over the code. Contributes to issue CURA-6600.	2019-08-15 17:01:22 +02:00
Ghostkeeper	3f944462ed	Use ContainerTree to get quality groups ... Contributes to issue CURA-6600.	2019-08-15 17:01:22 +02:00
Ghostkeeper	ed19e9e15c	Use ContainerTree to find quality groups ... Contributes to issue CURA-6600.	2019-08-15 17:01:22 +02:00
Ghostkeeper	8a51582210	Pre-fill list of qualities_per_type_per_extruder with empty dicts ... Otherwise you get an IndexError later on. Contributes to issue CURA-6600.	2019-08-15 17:01:21 +02:00
Ghostkeeper	44c98ba0d1	Fix import ... Should've checked first... Contributes to issue CURA-6600.	2019-08-15 17:01:21 +02:00
Ghostkeeper	02fbdd96a4	Don't return quality groups that are not available ... And don't return an arbitrary group then. That arbitrary group could also be unavailable. Contributes to issue CURA-6600.	2019-08-15 17:01:21 +02:00
Ghostkeeper	370d7adcd5	Let getDefaultQualityType use the container tree structure ... Contributes to issue CURA-6600.	2019-08-15 17:01:20 +02:00
Ghostkeeper	bee5491879	Move getQualityGroups to MachineNode ... It's specific to that machine and the container tree structure, so this is the best place for it we could find. Contributes to issue CURA-6600.	2019-08-15 17:01:20 +02:00
Ghostkeeper	ca163ea5f0	Skip inactive extruders to determine available quality types ... Contributes to issue CURA-6600.	2019-08-15 17:01:20 +02:00
Remco Burema	9374934d72	Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree	2019-08-15 16:47:29 +02:00
Remco Burema	1609138d4d	Remove deprecated ContainerNode.getChildNode(...) calls. ... part of CURA-6600	2019-08-15 13:56:41 +02:00
Ghostkeeper	fb509a0692	Fix setting the global quality node ... Otherwise you'd get a KeyError there. Contributes to issue CURA-6600.	2019-08-15 13:41:11 +02:00
Remco Burema	7fb9642e45	Replace deprecated .getContainer() calls with .container ... part of CURA-6600	2019-08-15 13:40:08 +02:00
Jaime van Kessel	76729360e1	Remove unused code ... CURA-6600	2019-08-15 13:33:17 +02:00
Jaime van Kessel	c0f70c447e	Ensure that the materials are loaded again ... CURA-6600	2019-08-15 13:32:42 +02:00
Jaime van Kessel	6a3a23a725	Add time logging about how long it took to construct the container tree ... CURA-6600	2019-08-15 13:11:45 +02:00
Ghostkeeper	47fe4b4c90	Re-add getMetadata() ... We need to deprecate it to not break functionality of old plug-ins and such. Contributes to issue CURA-6600.	2019-08-13 17:20:59 +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
Ghostkeeper	54b46abd0f	Use specific classes instead of ContainerNode superclass ... Also update the usage of these nodes because the getContainer() function is deprecated. Contributes to issue CURA-6600.	2019-08-13 17:20:58 +02:00
Ghostkeeper	5738af4bb8	No longer use deprecated MaterialManager when asking for available materials ... Use the ContainerTree structure instead. That's what it's for. Contributes to issue CURA-6600.	2019-08-13 17:20:58 +02:00
Ghostkeeper	7f84145c9a	Rewrite MaterialManager.getAvailableMaterials to use ContainerTree ... Makes it a lot simpler since the nodes in the tree already encoded the fallback mechanism. However I'm dropping support for filtering by diameter here, since the diameter is not known in the ContainerTree. I'm also dropping support for build plate materials for simplicity and to stay lean. Contributes to issue CURA-6600.	2019-08-13 17:20:58 +02:00
Jaime van Kessel	7af6d16de9	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-08-13 16:40:41 +02:00
Jaime van Kessel	c218b7ac56	Fix the tests for materialnode ... CURA-6600	2019-08-13 16:22:33 +02:00
Ghostkeeper	6a5f425468	Fix running tests via CMake ... The Settings folder conflicts with the same folder in Uranium, so it couldn't find MockContainer from the Uranium version. Contributes to issue CURA-6600.	2019-08-13 16:20:21 +02:00
Ghostkeeper	efaa96bca3	Fix building stack from freshly-loaded definition ... The definition may not have been added to the forest yet. Contributes to issue CURA-6600.	2019-08-13 15:44:17 +02:00
Ghostkeeper	93851a95d5	Remove unused variable ... Contributes to issue CURA-6600.	2019-08-13 15:04:06 +02:00
Ghostkeeper	6a8e1557c3	Merge branch 'feature_intent' into feature_intent_container_tree ... Conflicts: .gitlab-ci.yml cura/Machines/MaterialManager.py cura/Machines/VariantManager.py cura/Settings/ContainerManager.py cura/Settings/MachineManager.py tests/TestMachineManager.py	2019-08-13 14:59:05 +02:00
Ghostkeeper	20201c65e6	Merge branch 'master' into feature_intent ... Conflicts: resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously tests/TestMachineManager.py -> Due to changes in conftest.py tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties	2019-08-13 14:43:28 +02:00
Ghostkeeper	8fb0a09460	Remove unused imports ... Contributes to issue CURA-6600.	2019-08-13 14:06:42 +02:00
Ghostkeeper	01eaaf045d	Remove initialisation of tree in material manager ... This is now all contained in the ContainerTree code. Contributes to issue CURA-6600.	2019-08-13 14:04:57 +02:00
Ghostkeeper	66939192f9	Expand documentation of Maximum Deviation ... Fixes #6187.	2019-08-13 13:41:05 +02:00
Lipu Fei	2ed5fd73bc	Use certifi CA certs with urllib requests ... CURA-6698	2019-08-13 12:59:27 +02:00
Lipu Fei	349f4ccf28	Fix test command for plugins	2019-08-13 09:26:34 +02:00
Lipu Fei	3e5c693e89	Fix gitlab runner tags	2019-08-13 09:19:54 +02:00
ChrisTerBeke	445fb59c12	Fix setting connection state after re-connect, don't re-register output device	2019-08-12 23:22:16 +02:00
ChrisTerBeke	2ed3af5989	Fix removing output device when signing out	2019-08-12 22:59:43 +02:00
ChrisTerBeke	27905a02a9	Fix re-connecting after network comes back	2019-08-12 21:47:15 +02:00
ChrisTerBeke	945e5f08a3	Fix checking if still connected or not	2019-08-12 20:08:57 +02:00
Ghostkeeper	2bf4ac8522	No longer trigger rebuilding node tree from quality manager ... Also remove part of that from the material manager while we're at it. Contributes to issue CURA-6600.	2019-08-12 17:29:05 +02:00
Ghostkeeper	71aed6858c	Fix getting GUID from metadata ... Contributes to issue CURA-6600.	2019-08-12 17:21:26 +02:00
ChrisTerBeke	77adbdd286	Simpler check if group host	2019-08-12 17:19:20 +02:00