From 850a83fd8d6ca608a0b2f83f5b7fdb7b4c7a1585 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Sep 2016 13:18:38 +0200 Subject: [PATCH 1/2] We now use correct size of disallowed area for prime tower CURA-2394 --- cura/BuildVolume.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index acce9ee480..a2c554e115 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -367,8 +367,6 @@ class BuildVolume(SceneNode): areas.append(poly) - if self._prime_tower_area: - self._prime_tower_area = self._prime_tower_area.getMinkowskiHull(Polygon(approximatedCircleVertices(bed_adhesion_size))) # Add the skirt areas around the borders of the build plate. if bed_adhesion_size > 0: @@ -409,6 +407,8 @@ class BuildVolume(SceneNode): collision = False if self._prime_tower_area: for area in areas: + # Using Minkowski of 0 fixes the prime tower area so it's rendered correctly + self._prime_tower_area = self._prime_tower_area.getMinkowskiHull(Polygon(approximatedCircleVertices(0))) if self._prime_tower_area.intersectsPolygon(area) is not None: collision = True break From 799e66c3aca54e13e90c7beab68b3c95925e2bfe Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Sep 2016 14:33:38 +0200 Subject: [PATCH 2/2] Legacy profiles are now loaded as quality_changes CURA-2344 --- plugins/LegacyProfileReader/LegacyProfileReader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/LegacyProfileReader/LegacyProfileReader.py b/plugins/LegacyProfileReader/LegacyProfileReader.py index a3e4e60b6a..320951e852 100644 --- a/plugins/LegacyProfileReader/LegacyProfileReader.py +++ b/plugins/LegacyProfileReader/LegacyProfileReader.py @@ -130,5 +130,6 @@ class LegacyProfileReader(ProfileReader): if len(profile.getAllKeys()) == 0: Logger.log("i", "A legacy profile was imported but everything evaluates to the defaults, creating an empty profile.") profile.setDirty(True) - profile.addMetaDataEntry("type", "quality") + profile.addMetaDataEntry("type", "quality_changes") + profile.addMetaDataEntry("quality", "normal") return profile \ No newline at end of file