21759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ChrisTerBeke	e6d30516aa	Fix status interval check for cloud devices	2019-08-14 14:21:16 +02:00
Remco Burema	f947269cf8	Add machine_heated_build_volume. ... See also the engine. part of CURA-6717	2019-08-14 11:59:13 +02:00
Lipu Fei	00334ee5a9	Hide default build plate temperature ... CURA-6716	2019-08-14 10:58:48 +02:00
Lipu Fei	4947757688	Hide default material print temperature ... CURA-6716	2019-08-14 10:55:12 +02:00
ChrisTerBeke	fcd5a563e4	Use cluster_size property from zeroconf if available	2019-08-13 21:42:44 +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
ChrisTerBeke	998f58d3fa	Tweak offline check interval for cloud device	2019-08-13 15:19:30 +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
Lipu Fei	5294e721ac	Merge pull request #6198 from Ultimaker/CS-234_reduce_network_manager_instances ... Only create API client when actually used	2019-08-13 13:49:19 +02:00
Ghostkeeper	66939192f9	Expand documentation of Maximum Deviation ... Fixes #6187.	2019-08-13 13:41:05 +02:00
ChrisTerBeke	33876e9ca9	Set group_name correct with cloud devices, possibly fixes CS-225	2019-08-13 13:01:47 +02:00
Lipu Fei	2ed5fd73bc	Use certifi CA certs with urllib requests ... CURA-6698	2019-08-13 12:59:27 +02:00
ChrisTerBeke	2a9be0cdfe	Only create API client when actually used	2019-08-13 12:55:54 +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
Ghostkeeper	ee0f2d2773	Improve documentation ... Contributes to issue CURA-6600.	2019-08-12 17:18:22 +02:00
Ghostkeeper	447b1b9645	Actually import MaterialManager ... Because this class is being used. Contributes to issue CURA-6600.	2019-08-12 17:14:11 +02:00
Ghostkeeper	42ba9a9f39	Pre-filter qualities on other properties before filtering on material ... This prevents a LOT of double queries. Contributes to issue CURA-6600.	2019-08-12 17:13:25 +02:00
Ghostkeeper	5bbb44bfdf	Remove buildplate loading of materials and don't check if variant is there ... So now we no longer make material subprofiles per buildplate. And now we create subprofiles for variants regardless if the variant exists or not. Contributes to issue CURA-6600.	2019-08-12 16:49:57 +02:00
Ghostkeeper	1bd287f888	Move getting variant manager out of the loop ... This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal. Contributes to issue CURA-6600.	2019-08-12 16:49:57 +02:00
Ghostkeeper	b1fb843f09	Implement matching qualities by material_id with same material type OR GUID ... This fallback with the GUID makes this part a lot more complex, but in theory it should work. I hope that we can get some tests to debug this because it's 90% made from the top of my head now. Contributes to issue CURA-6600.	2019-08-12 16:49:56 +02:00
ChrisTerBeke	2fb1311d93	Don't register devices needlessly, for now remove initial update	2019-08-12 16:33:59 +02:00
Jaime van Kessel	e08feb1099	Fix final set of broken tests ... CURA-6600	2019-08-12 16:32:59 +02:00
Jaime van Kessel	e18820b846	Fix tests for ContainerManager ... CURA-6600	2019-08-12 15:37:19 +02:00
Jaime van Kessel	719e69692c	Fix import issues ... CURA-6600	2019-08-12 15:20:09 +02:00
Jaime van Kessel	fc3461d865	Fix the machine node test ... CURA-6600	2019-08-12 15:11:59 +02:00
Ghostkeeper	98686dd088	Fix imports for CuraApplication ... Also removed two unused imports. Contributes to issue CURA-6600.	2019-08-12 15:06:04 +02:00
Jaime van Kessel	6cea609b56	Fix intentManager test ... Since we changed how the QualityManager is constructed, the test should change as well CURA-6600	2019-08-12 14:52:05 +02:00
Jaime van Kessel	99afa6b533	Fix import issue ... CURA-6600	2019-08-12 14:47:28 +02:00
Ghostkeeper	74b6501235	Check for MachineNode instead of MaterialNode ... I thought I already changed that, but not apparently. Contributes to issue CURA-6600.	2019-08-12 14:39:43 +02:00
Jaime van Kessel	8c4f8e8979	Merge branch 'master' of github.com:Ultimaker/Cura	2019-08-12 14:29:38 +02:00