23379 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	8d05ebef9d	Fix crash on adding a new printer ... CURA-6600	2019-08-16 10:24:50 +02:00
Remco Burema	7ed8d0b2f7	Remove deprecated .getMetadata() call. ... part of CURA-6600	2019-08-16 09:37:58 +02:00
ChrisTerBeke	60758093f1	Determine skeleton loading properly	2019-08-15 21:29:20 +02:00
ChrisTerBeke	75f52c5a24	Bring back skeleton loading for monitor stage	2019-08-15 21:25:56 +02:00
ChrisTerBeke	7e9662e30e	Fix monitor tab UI not updating for cloud device due to overridden signals	2019-08-15 20:25:59 +02:00
ChrisTerBeke	9e6e9a4beb	Enable force override print job in local network, fix override button not enabled on older firmwares	2019-08-15 20:16:55 +02:00
ChrisTerBeke	de3f82610a	Add tooltips for firmware update back, fix print job override state	2019-08-15 19:42:25 +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
ChrisTerBeke	36f6bdca18	Bring cast back to fix typing	2019-08-15 14:36:25 +02:00
ChrisTerBeke	83ce3f6ea6	Merge branch 'master' of https://github.com/Ultimaker/Cura	2019-08-15 14:30:25 +02:00
ChrisTerBeke	6833323845	UM3PrinterAction - refactor to property, remove discovery start from reset	2019-08-15 14:30:11 +02:00
Remco Burema	1609138d4d	Remove deprecated ContainerNode.getChildNode(...) calls. ... part of CURA-6600	2019-08-15 13:56:41 +02:00
Lipu Fei	581cde1ddf	Use HTTPS for firmware update check URLs	2019-08-15 13:42:13 +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
Lipu Fei	4feb22e065	Fix version upgrade for imade3d jellybox ... CURA-6709	2019-08-15 13:37:04 +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
ChrisTerBeke	ab4fd3a7f9	Merge branch 'master' of https://github.com/Ultimaker/Cura	2019-08-15 13:21:17 +02:00
ChrisTerBeke	eb5e1904ab	Fix setting printer type on print job	2019-08-15 13:21:10 +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
Lipu Fei	f20696966d	Fix logging in FirmwareUpdateChecker	2019-08-15 13:03:51 +02:00
Ghostkeeper	f440535581	Add platform mesh for Creality Ender-3 ... Provided by Sprint8 in #6204, but I think the mesh was obtained from an older Cura version. This fixes #6204.	2019-08-15 11:31:19 +02:00
Lipu Fei	214194de85	Merge pull request #6202 from Ultimaker/CURA-6717_machine_heated_build_volume ... Add machine_heated_build_volume.	2019-08-15 09:37:18 +02:00
Lipu Fei	e8fd013329	Fix OAuth2 test	2019-08-15 09:23:05 +02:00
Lipu Fei	4c792419e3	Use QDesktopServices.openUrl() instead of webbrowser	2019-08-15 08:57:19 +02:00
Lipu Fei	a2dcbc3be7	Use certifi for firmware update checker ... CURA-6698	2019-08-14 14:57:52 +02:00
Lipu Fei	6b93c97a5e	Use certifi for uploading crash reports ... CURA-6698	2019-08-14 14:55:36 +02:00
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