From 612bb39680bf763931236e09c0d352a2003812c1 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 20 Jul 2016 11:36:32 +0200 Subject: [PATCH] Compensated build volume bbox and scale_to_max_bounds with raft_thickness. Rework of CURA-1707 --- cura/BuildVolume.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 1709a67dd5..e5bd037f1b 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -191,7 +191,9 @@ class BuildVolume(SceneNode): else: self._disallowed_area_mesh = None - self._volume_aabb = AxisAlignedBox(minimum = Vector(min_w, min_h - 1.0, min_d), maximum = Vector(max_w, max_h, max_d)) + self._volume_aabb = AxisAlignedBox( + minimum = Vector(min_w, min_h - 1.0, min_d), + maximum = Vector(max_w, max_h - self._raft_thickness, max_d)) skirt_size = 0.0 @@ -204,7 +206,7 @@ class BuildVolume(SceneNode): # The +1 and -1 is added as there is always a bit of extra room required to work properly. scale_to_max_bounds = AxisAlignedBox( minimum = Vector(min_w + skirt_size + 1, min_h, min_d + disallowed_area_size - skirt_size + 1), - maximum = Vector(max_w - skirt_size - 1, max_h, max_d - disallowed_area_size + skirt_size - 1) + maximum = Vector(max_w - skirt_size - 1, max_h - self._raft_thickness, max_d - disallowed_area_size + skirt_size - 1) ) Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds