6967 commits

Author	SHA1	Message	Date
Ghostkeeper	53e35daf02	Merge branch 'master' of github.com:Ultimaker/Cura	2017-06-29 13:45:02 +02:00
Jaime van Kessel	13f3477288	Fixed crash when adding a single extrusion printer ... CURA-3980	2017-06-29 10:15:29 +02:00
Ghostkeeper	ab384ba8ec	Rename and invert moving disallowed areas metadata property ... It's more easy semantically to invert this, to prevent the double negatives. Contributes to issue CURA-3663.	2017-06-28 17:16:27 +02:00
Jaime van Kessel	4a5b1d0760	Merge branch 'feature_xy_offset_layer_0' of https://github.com/fieldOfView/Cura	2017-06-28 15:16:18 +02:00
Jaime van Kessel	f791017091	Revert "Added the no-nozzle offset for all polygons" ... This reverts commit 45eb301f9b.	2017-06-28 14:20:12 +02:00
Jaime van Kessel	45eb301f9b	Added the no-nozzle offset for all polygons ... CURA-3663	2017-06-28 13:55:45 +02:00
fieldOfView	39cb68bd30	Update convex hull to account for first layer horizontal expansion	2017-06-28 11:41:51 +02:00
Ghostkeeper	fb1d7bc223	Fix direction of Y-offset in disallowed areas ... The front end has inverted Y with respect to the g-code. The prime position was correctly inverted but the nozzle offset wasn't.	2017-06-28 09:23:14 +02:00
Ghostkeeper	21624d7761	Merge branch '2.6'	2017-06-27 16:25:55 +02:00
Ghostkeeper	b2b9b1bede	Fix checking if container stack exists ... It was checking a container stack ID against the definition containers, which doesn't match. Contributes to issue CURA-3973.	2017-06-27 15:14:26 +02:00
Ghostkeeper	df2ec7bd73	Don't try to activate a machine that we don't have a definition for ... Contributes to issue CURA-3973.	2017-06-27 14:02:35 +02:00
Jaime van Kessel	7813bfc543	No longer crash when trying to get non existing extruder stacks ... CURA-3953	2017-06-26 13:16:14 +02:00
Jaime van Kessel	7f98646b42	Merge branch 'feature_CURA-3663_optional_offsetting_for_disallowed_areas' of github.com:Ultimaker/Cura	2017-06-26 10:58:16 +02:00
Ghostkeeper	13c9519a7c	Fix deprecated decorator ... Contributes to issue CURA-2822.	2017-06-23 09:42:08 +02:00
Lipu Fei	b958e30fe6	Add machine_disallowed_areas and turn off nozzle offsetting for disallowed areas calculation ... CURA-3663 We don't need to calculate the disallowed areas for certain machines because they have taken into account the nozzle offsets. This commit does the following: - Add machine_disallowed_areas - Add a flag in definition so that disallowed areas calculation with nozzle offsets becomes optional in Cura. Update documentation for no offsetting for nozzles Contributes to issue CURA-3663.	2017-06-23 08:33:03 +02:00
Ghostkeeper	bc219a06fe	Add MaterialsModel to make material list update upon metadata change ... This new model inherits from InstanceContainersModel. The only change is that it updates when the metadata of a material container changes. This is needed to make the list of materials update when the material diameter changes. Contributes to issue CURA-2822.	2017-06-22 18:17:16 +02:00
Ghostkeeper	0e23930bfe	Fix checking whether the old material diameter was the same ... Getting the old material diameter wasn't working properly. Contributes to issue CURA-2822.	2017-06-22 18:17:16 +02:00
Ghostkeeper	7ea1d4cc5a	Add getContainerProperty function ... The opposite of setContainerProperty. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	f041473465	Fix applying material diameter undo ... Somehow it seems to get the wrong value there though. Debugging that next... Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	c192d37daa	Fix connecting undo action to undo button ... Also hiding the message afterwards. Apparently that's not done automatically. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	b37fa6f718	Implement warning message when you change material diameter ... The undo functionality currently gives an error though. Investigating... Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	121bf5897d	Deprecate _updateMaterialContainer ... There are better alternatives nowadays. Discovered during CURA-2822.	2017-06-22 18:17:15 +02:00
Ghostkeeper	fc96dfec4e	Expose approximateMaterialDiameter of the definition ... This way we can request that from QML. Contributes to issue CURA-2822.	2017-06-22 18:17:15 +02:00
Lipu Fei	7fe5c2ad07	Fix code style ... CURA-3663	2017-06-21 14:48:54 +02:00
Jaime van Kessel	5375d43320	Merge branch 'fix_layerview_python3.6' of https://github.com/sheinz/Cura	2017-06-19 11:13:31 +02:00
Jaime van Kessel	41c5aaed69	Merge branch '2.6' of github.com:Ultimaker/Cura	2017-06-16 13:53:05 +02:00
Lipu Fei	5647800aec	Merge pull request #1978 from Ultimaker/feature_sanding_horizontal ... Horizontal Ironing	2017-06-16 11:55:45 +02:00
Jaime van Kessel	2adf97ba2d	Also apply the filtering on the quality and user profiles model ... CURA-3935	2017-06-15 17:18:04 +02:00
Ghostkeeper	29b90d26b8	Re-enable centre camera on selection ... With Qt 5.8 it works again on Windows.	2017-06-15 16:16:56 +02:00
Jaime van Kessel	c93acc12e7	Merge branch '2.6' of github.com:Ultimaker/Cura	2017-06-15 15:28:34 +02:00
Ghostkeeper	e003abf895	Only display global quality changes profiles ... There's one copy for every stack. It doesn't matter which one we take as long as they have the same name. Global is always present, even in single extrusion. Seems the most logical one to display. Contributes to issue CURA-3935.	2017-06-15 14:38:04 +02:00
Ghostkeeper	66f5b236d6	Merge branch '2.6'	2017-06-15 09:54:19 +02:00
Ghostkeeper	ebd2f0b415	Fix switching to quality changes profiles ... It would put the global quality changes profile in each of the extruders, thus not giving any per-extruder settings. Contributes to issue CURA-3935.	2017-06-14 15:30:55 +02:00
Ghostkeeper	f4e620c458	Remove unused variable ... Contributes to issue CURA-3935.	2017-06-14 13:40:57 +02:00
Jaime van Kessel	7551c83612	QualityChanges are now also removed if a machine has a parentDefinition ... CURA-3929	2017-06-14 11:04:22 +02:00
Ghostkeeper	8bce6e060c	Merge branch '2.6'	2017-06-14 10:58:11 +02:00
fieldOfView	49f2fb2cea	Fix filtering maerials after editing materials ... NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.	2017-06-14 10:42:04 +02:00
fieldOfView	8f7471a892	Remove debug statement	2017-06-14 10:41:53 +02:00
fieldOfView	ed6f4d851c	Update documentation	2017-06-14 10:41:39 +02:00
fieldOfView	c9998ca6fe	Set properties for all containers with the same base_file metadata entry	2017-06-14 10:41:23 +02:00
fieldOfView	1f49a87acb	Update material_diameter when editing the material in MaterialView.qml	2017-06-14 10:41:02 +02:00
Jaime van Kessel	a7a2740690	No longer add material to qualityChanges ... QualityChanges are never supposed to have Material. CURA-3929	2017-06-14 09:41:33 +02:00
Jaime van Kessel	1020b0a2f3	Finding all qualities no longer does silly things with materials ... The fetchContainer function also did magical material filtering, which caused it to go haywire. CURA-3929	2017-06-14 09:40:11 +02:00
Lipu Fei	0e09094a3d	Merge branch '2.6'	2017-06-13 15:06:37 +02:00
Lipu Fei	dd65248968	Only set metadata/material for quality_changes if material is not None ... CURA-3929	2017-06-13 14:35:27 +02:00
Jaime van Kessel	c8d9720a8a	Merge branch '2.6' of github.com:Ultimaker/Cura	2017-06-13 13:51:55 +02:00
Jaime van Kessel	ec73abecb5	Custom material now defaults to PLA. ... This is not an ideal solution, but it bandaids a problem for the moment. CURA-3911	2017-06-13 13:48:34 +02:00
Arjen Hiemstra	e5df4c4c5e	Merge branch '2.6' ... * 2.6: Merge pull request #1910 from Ultimaker/fix_dialog_sizes Fix ordering of merged PlatformPhysicsOperation	2017-06-13 13:23:35 +02:00
Arjen Hiemstra	d44caa281b	Fix ordering of merged PlatformPhysicsOperation ... This makes sure we undo the PP operation before the other operation, so the ordering of operations is still correct. Contributes to CURA-3912	2017-06-13 13:10:59 +02:00
Jaime van Kessel	df67ae18f1	Merge branch '2.6' of github.com:Ultimaker/Cura	2017-06-12 15:25:35 +02:00