23379 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Jaime van Kessel	242c3a7470	Fix crash when arranging special meshtypes ... CURA-6702	2019-08-12 14:29:15 +02:00
Jaime van Kessel	789eddbdee	Add missing typing ... CURA-6702	2019-08-12 14:23:53 +02:00
Ghostkeeper	8f075b644d	Add global quality nodes to machine node ... This means that the parent of the quality node could be one of two types. A bit confusing. Contributes to issue CURA-6600.	2019-08-12 14:18:51 +02:00
Ghostkeeper	fff26bb021	Fix imports and references to managers ... Use getInstance() where applicable. Contributes to issue CURA-6600.	2019-08-12 14:15:40 +02:00
Ghostkeeper	91e14a90b2	Update getQualityGroups to use the new ContainerTree structure ... Look how greatly this is now simplified. The fallbacks for which material nodes to check is not yet implemented. Will do that next. Contributes to issue CURA-6600.	2019-08-12 14:02:19 +02:00
Lipu Fei	f86ca15676	Change support_infill_angle to support_infill_angles ... CURA-5882	2019-08-12 13:57:29 +02:00
Jaime van Kessel	5bc7ddf3ee	Merge branch 'master' of github.com:Ultimaker/Cura	2019-08-12 13:25:13 +02:00
Jaime van Kessel	290b8f4307	Add formulas to the definition file so they get notified of updates ... This is a work around for a rather fundamental issue with the current setting system; The relationships are only created based on the definitions. So if a definition doesn't have a formula, but a profile does, it doesn't get updated in the interface. CURA-6708	2019-08-12 13:23:42 +02:00
Lipu Fei	b65482e992	Fix typing	2019-08-12 12:22:57 +02:00
Jaime van Kessel	3b9ab9901e	Merge branch 'master' of github.com:Ultimaker/Cura	2019-08-12 10:51:14 +02:00