2845 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
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
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
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
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
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
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
Lipu Fei	c7667b56e2	Multiple fixes for stacks ... CURA-4617	2017-11-24 09:45:59 +01:00
Ghostkeeper	37935a8a90	Load only metadata on start-up ... Contributes to issue CURA-4243.	2017-11-23 16:47:55 +01:00
Lipu Fei	2397b68cd7	Optimize MaterialsModel update ... CURA-4546	2017-11-23 14:07:40 +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
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
ChrisTerBeke	6c3eaca0fd	fix loading user changes container for single extruder machine	2017-11-22 16:22:23 +01:00
Jack Ha	3b5ed70113	CURA-4602 Fixed active custom profile selected check	2017-11-22 16:15:06 +01:00
Lipu Fei	a7a3ba9500	Always update the job name when a project file is loaded ... CURA-4553	2017-11-22 13:10:09 +01:00
ChrisTerBeke	532cfd8404	Fix showing correct quality changes in dropdown list after upgrading - CURA-4482	2017-11-22 10:48:21 +01:00
Lipu Fei	f8fe6cd455	Treat project files the same way as model files for job name ... CURA-4553	2017-11-22 10:17:53 +01:00
Lipu Fei	aeb478bb4b	Should only show Keep/Discard dialog when it's needed ... CURA-4599	2017-11-22 09:32:17 +01:00
Lipu Fei	31c859b3d7	Show Keep/Discard dialog after the containers have been changed ... CURA-4599 Or the default values will reflect those before the switch.	2017-11-22 09:18:20 +01:00
ChrisTerBeke	0625d22e04	Fix update script for single extrusion quality changes - CURA-4482	2017-11-21 16:43:05 +01:00
ChrisTerBeke	7c28f6f149	Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1	2017-11-21 15:32:08 +01:00
ChrisTerBeke	62d70b46d6	Fix filtering custom profiles per extruder - CURA-4482	2017-11-21 15:31:59 +01:00
Lipu Fei	8782e2e529	Rename parameters ... CURA-4581	2017-11-21 15:12:56 +01:00
Lipu Fei	f18cb951fc	Use workspaceLoaded signal instead of projectFileLoaded ... CURA-4581	2017-11-21 13:49:25 +01:00
Diego Prado Gesto	b6e997c88d	CURA-4526 Delete LayerView plugin because it will be replaced with the ... SimulationView. This commit also adapts the code in order to accept the messages coming from the engine, with information about feedrates and line thicknesses. Add also some changes in the GCodeReader that reads feedrates and line thickness from the gcode file.	2017-11-21 10:47:29 +01:00
jack	f197508694	Merge pull request #2814 from Ultimaker/feature_maximum_resolution ... Maximum mesh resolution	2017-11-20 18:09:11 +01:00
Aleksei S	10b5a19043	Fix merge conflict	2017-11-20 17:56:54 +01:00
ChrisTerBeke	657a91c525	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-20 17:42:26 +01:00
fieldOfView	1924946b59	Merge branch 'master' into feature_mesh_types ... # Conflicts: # plugins/SolidView/SolidView.py	2017-11-18 11:28:15 +01:00