From 4e6756802fa5214fe1ab815df0fd10ab82f053f2 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 23 Aug 2016 11:36:34 +0200 Subject: [PATCH 1/2] Correct position of prime_tower disallowed area CURA-2155 --- cura/BuildVolume.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index ee084a764f..c0ac94b64d 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -304,15 +304,15 @@ class BuildVolume(SceneNode): # Add prima tower location as disallowed area. if self._global_container_stack.getProperty("prime_tower_enable", "value"): - half_prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value") / 2 + prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value") prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value") - machine_width / 2 prime_tower_y = - self._global_container_stack.getProperty("prime_tower_position_y", "value") + machine_depth / 2 disallowed_areas.append([ - [prime_tower_x - half_prime_tower_size, prime_tower_y - half_prime_tower_size], - [prime_tower_x + half_prime_tower_size, prime_tower_y - half_prime_tower_size], - [prime_tower_x + half_prime_tower_size, prime_tower_y + half_prime_tower_size], - [prime_tower_x - half_prime_tower_size, prime_tower_y + half_prime_tower_size], + [prime_tower_x - prime_tower_size, prime_tower_y - prime_tower_size], + [prime_tower_x, prime_tower_y - prime_tower_size], + [prime_tower_x, prime_tower_y], + [prime_tower_x - prime_tower_size, prime_tower_y], ]) # Add extruder prime locations as disallowed areas. From 53ce8bc4c9fecb431e836273cee2daf6d3d523d5 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 23 Aug 2016 11:50:46 +0200 Subject: [PATCH 2/2] Fix typo --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index c0ac94b64d..88171ee972 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -302,7 +302,7 @@ class BuildVolume(SceneNode): machine_width = self._global_container_stack.getProperty("machine_width", "value") machine_depth = self._global_container_stack.getProperty("machine_depth", "value") - # Add prima tower location as disallowed area. + # Add prime tower location as disallowed area. if self._global_container_stack.getProperty("prime_tower_enable", "value"): prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value") prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value") - machine_width / 2