2653 commits

Author	SHA1	Message	Date
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
Aleksei S	f484467f86	Clean project name in PrintInformation after removing the last model ... CURA-4581	2017-11-17 18:11:22 +01:00
Aleksei S	93de006271	Remove suffix .curaproject for case "import models"	2017-11-17 15:22:29 +01:00
ChrisTerBeke	f48539cc93	Merge pull request #2685 from Ultimaker/container_stack_improvements ... Container stack improvements	2017-11-17 13:09:54 +01:00
Lipu Fei	2c39612bc8	Fix UM2 upgrade regarding the variant ... CURA-4482 UM2 by default doesn't have variants, but if the user enables Olsson Block, the variant option will become available. This commit fixes the following cases: - Make sure that the variant is set on the extruder stack but not the global stack - Extruder stacks don't contain information such as has_variant. Such info should be retrieved from the global stack and not just from the definition container because they can be overriden by other containers.	2017-11-17 12:47:30 +01:00
Lipu Fei	e246784df2	Use parseBool() for metadata bool values ... CURA-4482	2017-11-17 12:43:30 +01:00
Lipu Fei	cd37f91a0a	Remove unnecessary code in BuildVolume ... CURA-4482	2017-11-17 11:02:41 +01:00
Thomas Karl Pietrowski	b2da4894b1	CuraApplication: Rename file --> file_name ... 'file' is a built-in function!	2017-11-15 01:21:08 +01:00
ChrisTerBeke	88cf40e2d7	Merge branch 'master' into container_stack_improvements	2017-11-10 14:35:13 +01:00
fieldOfView	9c3e50c494	Ignore models without a convex hull when auto arranging	2017-11-09 19:21:05 +01:00
Jaime van Kessel	f2e7fef747	Update PreviewPass so that only slicable objects are rendered	2017-11-09 13:51:47 +01:00
fieldOfView	0b11117d6d	Set a property for non-printing-meshes ... Remove code duplication	2017-11-09 12:28:55 +01:00
fieldOfView	ff14db9133	Remove convex hull for meshes that don't print geometry ... Anti-overhang, Infill and Cutting meshes don't print geometry, so they don't need to push other objects away.	2017-11-09 11:29:50 +01:00
Jaime van Kessel	06045f036e	Added previewPass	2017-11-08 16:37:24 +01:00
Lipu Fei	d65ae62876	Merge pull request #2743 from Ultimaker/headless_cura ... Headless cura	2017-11-07 11:07:43 +01:00
ChrisTerBeke	d32b7f0091	Merge branch 'master' into container_stack_improvements	2017-11-06 09:49:44 +01:00
Diego Prado Gesto	a623c2ae75	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-02 09:53:36 +01:00
Diego Prado Gesto	d503283089	CURA-4509 Minor fix that avoids crashes when there is no specified ... material (such as in UM2)	2017-11-02 09:51:57 +01:00
Ghostkeeper	e48b151d40	Express getConfigurationTypeFromSerialized as function of its parent ... This prevents code duplication a bit and allows us to make it a classmethod. Contributes to issue CURA-4243.	2017-11-01 16:17:26 +01:00
ChrisTerBeke	142ff4e9dc	Merge pull request #2669 from fieldOfView/feature_jogging ... Jogging	2017-11-01 16:15:40 +01:00
alekseisasin	db51054984	Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area ... Cleanup save/monitor button area	2017-11-01 15:53:20 +01:00
ChrisTerBeke	e29fdbe76d	Cleanup - CURA-4482	2017-11-01 14:32:58 +01:00
ChrisTerBeke	e23e6cfa31	Fix for global quality in case of user created quality profile - CURA-4482	2017-11-01 13:59:21 +01:00
ChrisTerBeke	97421ecf58	Create container stacks when loading older project file - CURA-4482	2017-11-01 13:31:25 +01:00
Mark	3ba7db1420	Merge branch 'master' into headless_cura	2017-11-01 13:25:09 +01:00
ChrisTerBeke	957009a768	Fix finding global quality for multi extrusion machines - CURA-4482	2017-10-31 17:32:21 +01:00
ChrisTerBeke	8f41185f22	Fix extruder manager single instance from qml - CURA-4482	2017-10-31 17:18:19 +01:00
ChrisTerBeke	2e1da58570	Cleanup - CURA-4482	2017-10-31 17:06:34 +01:00