3088 commits

Author	SHA1	Message	Date
ChrisTerBeke	b961c37ead	Fix generating view for machine action - CURA-4568	2017-11-28 15:18:05 +01:00
ChrisTerBeke	11f50f1cd3	Update machine action and image reader dialogs with new component creation method - CURA-4568	2017-11-28 14:55:35 +01:00
Ghostkeeper	eb3981b4e0	Let _fetchInstanceContainers return containers split by loaded or not ... It must now return two dictionaries: One for the profiles that have been completely loaded and one for the profiles that are only metadata. We could probably improve on these a little bit, since all of these (except the material model) will now load all available quality profiles. I'll see if it is necessary to optimise that. Contributes to issue CURA-4243.	2017-11-28 14:26:14 +01:00
ChrisTerBeke	74eb4958af	Fixes for printer output device views - CURA-4568	2017-11-28 14:21:47 +01:00
ChrisTerBeke	cfbb553182	Use new QML element creator for output device view - CURA-4568	2017-11-28 14:16:58 +01:00
Jaime van Kessel	9084dfd6bd	It's now possible to send print jobs to cluster again ... CL-541	2017-11-28 12:59:54 +01:00
Jaime van Kessel	cfc6a3ad48	Added some convenience functions to NetworkedPrinterOutputdevice ... This also moves the getUser from legacy to networked printer CL-541	2017-11-28 12:43:49 +01:00
ChrisTerBeke	9db8bff924	Merge pull request #2838 from fieldOfView/fix_crashhandler_crash ... Fix error when CrashHandler is opened before opengl is initialised	2017-11-28 10:38:23 +01:00
ChrisTerBeke	e6e8353ea8	Merge pull request #2838 from fieldOfView/fix_crashhandler_crash ... Fix error when CrashHandler is opened before opengl is initialised	2017-11-27 17:18:38 +01:00
ChrisTerBeke	a072af5585	Merge branch '3.1'	2017-11-27 17:17:02 +01:00
Jaime van Kessel	c1c59925de	Removed duplicated code ... CL-541	2017-11-27 17:14:30 +01:00
Jaime van Kessel	83b13546fb	Moved compressing of GCode to one class higher ... CL-541	2017-11-27 17:12:36 +01:00
ChrisTerBeke	26b9fc3163	Only create extruder stack for single extrusion machine when not yet existing - CURA-4482	2017-11-27 16:55:01 +01:00
ChrisTerBeke	8cfaa44580	Fix resolving global stack definition when switching variant - CURA-4620	2017-11-27 16:40:23 +01:00
Jaime van Kessel	5d3779da26	Update cluster view components ... CL-541	2017-11-27 15:54:44 +01:00
Ghostkeeper	e5427eded6	Refactor _getBasicMaterials to only handle metadata ... Otherwise the full profile of all materials and all their definitions gets loaded. Contributes to issue CURA-4243.	2017-11-27 15:38:11 +01:00
ChrisTerBeke	9e6704a162	Fix extruder stack machine definition link for per extruder settings resolvement - CURA-4627	2017-11-27 15:14:32 +01:00
Jaime van Kessel	52a137a68c	Ensured that sidebar has the right properties to show again ... CL-541	2017-11-27 14:42:45 +01:00
Ghostkeeper	952e3974eb	Remove convenience handling of 'None' ... Because this parameter has type checking, we'll get warned if this variable is None. Contributes to issue CURA-4243.	2017-11-27 14:22:09 +01:00
Lipu Fei	49cac860a8	Fix project loading ... CURA-4617	2017-11-27 14:17:13 +01:00
Ghostkeeper	17a25f98a4	Merge branch '3.1'	2017-11-27 13:58:52 +01:00
Jaime van Kessel	f791b53ad8	Enabled monitor items for ClusterOutputDevice again ... CL-541	2017-11-27 13:54:34 +01:00
Jaime van Kessel	083eee2e9d	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-11-27 13:43:39 +01:00
Ghostkeeper	99780c3b44	Fix casing of getMetadataEntry ... This is done a bit inconsistently because it's unclear whether metadata should be considered as one word or two. I'd say it is one word, not 'meta data', but people seem to disagree. Contributes to issue CURA-4243.	2017-11-27 13:31:29 +01:00
Jaime van Kessel	0613b1e4b7	Creating components is now done with the prefab function ... CURA-4568	2017-11-27 13:00:49 +01:00
Lipu Fei	1866c4ee66	Split user settings for single extrusion machines ... CURA-4617	2017-11-27 12:56:53 +01:00
Ghostkeeper	4189f8dfa3	Use new findDirtyContainers function ... This prevents all instance containers from being loaded every time we auto-save. Contributes to issue CURA-4243.	2017-11-27 11:59:37 +01:00
Jaime van Kessel	f570ba046b	Added rudimentary jogging controls for UM3 ... This needs a bit more love; The machine is a bit stupid when it comes to moving outside of build area. CL-541	2017-11-27 11:02:56 +01:00
Jaime van Kessel	00eeb835ac	ManualPrinterControl uses correct functions again ... CL-541	2017-11-27 10:22:30 +01:00
ChrisTerBeke	8082c092e5	Fix setting extruder definition in user changes container	2017-11-27 09:54:10 +01:00
Ghostkeeper	9938678347	Fix setting IDs of empty containers ... The _id hasn't been used for a very long time. Contributes to issue CURA-4243.	2017-11-27 09:16:27 +01:00
Ruben D	ffef26097d	Merge branch '3.1'	2017-11-26 18:48:42 +01:00
Aleksei S	bb2be70dac	Finds candidate quality profile for fdmextruder ... CURA-4620	2017-11-25 02:25:36 +01:00
fieldOfView	77d134a3b7	Fix python error when CrashHandler is opened before opengl is initialised ... Contributes to #2837	2017-11-24 16:55:18 +01:00
Ghostkeeper	ebe766a7c8	Set definition by their ID ... The new function for setting the definition just adds the ID to the metadata. Contributes to issue CURA-4243.	2017-11-24 16:45:09 +01:00
Ghostkeeper	4a8dacbe06	Make crash handler easier to translate ... All that formatting doesn't need to be translated along. It's only confusing, especially because of those variable names. They always need to be in that position anyway. Contributes to issue CURA-4601.	2017-11-24 13:16:14 +01:00
Aleksei S	6cea9c59e8	Prevent crash handler exception	2017-11-24 11:59:09 +01:00
Jaime van Kessel	57de028608	re-implemented abort & pause for legacy um3 ... CL-541	2017-11-24 11:26:30 +01:00
Lipu Fei	c7667b56e2	Multiple fixes for stacks ... CURA-4617	2017-11-24 09:45:59 +01:00
Jaime van Kessel	219e285b20	Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite	2017-11-24 09:23:21 +01:00
Jaime van Kessel	c523a6ddf6	Progress is now shown for LegacyPrinter while printing ... CL-541	2017-11-24 09:22:50 +01:00
Jaime van Kessel	1c2c4d4163	Added property to indicate if output device accepts commands ... Instead of how this was previously done, it's now tied to the auth state. CL-541	2017-11-23 17:07:24 +01:00
Ghostkeeper	37935a8a90	Load only metadata on start-up ... Contributes to issue CURA-4243.	2017-11-23 16:47:55 +01:00
Jaime van Kessel	0b91112d72	Fixed postForm ... Setting the type of the request to json messed up the multi-part stuff. CL-541	2017-11-23 16:43:52 +01:00
Lipu Fei	2397b68cd7	Optimize MaterialsModel update ... CURA-4546	2017-11-23 14:07:40 +01:00
Jaime van Kessel	8b8d67b3a8	LegacyUM3 now handles warnings & errors again ... CL-541	2017-11-23 13:37:59 +01:00
Lipu Fei	17f09ec21e	Fix variant/material/quality handling in stacks ... CURA-4613	2017-11-23 12:46:33 +01:00
Lipu Fei	18c7a5acf3	Pass optional file_name for deserialization ... CURA-4613 Some upgrades depend on the file_name, so the file_name is needed in this case.	2017-11-23 11:28:16 +01:00
Jaime van Kessel	96d5c7152b	Added sending material profiles to LegacyUM3 ... CL-541	2017-11-23 10:31:39 +01:00
Ghostkeeper	105d7a5615	Return newly added single extruder ... The workspace reader needs to use it to get the correct material. Contributes to issue CURA-4604.	2017-11-22 17:12:53 +01:00