From 01c67eea48203af2f6aa960c611e076d83b8687c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perdig=C3=A3o?= Date: Thu, 17 Oct 2024 17:36:49 -0300 Subject: [PATCH] Fix issue with joining walls with negative direction sense. --- src/bonsai/bonsai/bim/module/model/wall.py | 45 ++++++++++++++++------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/model/wall.py b/src/bonsai/bonsai/bim/module/model/wall.py index bfb97575c8..c96b7b909d 100644 --- a/src/bonsai/bonsai/bim/module/model/wall.py +++ b/src/bonsai/bonsai/bim/module/model/wall.py @@ -1469,22 +1469,43 @@ class DumbWallJoiner: if connection1 == connection2: if (connected_at_end and angle > 0) or (not connected_at_end and angle < 0): - pt = bbf.to_2d().to_3d() - x_axis = bsn - bbf - y_axis = tbf - bbf + if layers1['direction_sense'] == 'POSITIVE': + pt = bbf.to_2d().to_3d() + x_axis = bsn - bbf + y_axis = tbf - bbf + else: + pt = bsf.to_2d().to_3d() + x_axis = bbn - bsf + y_axis = tsf - bsf else: - pt = bbn.to_2d().to_3d() - x_axis = bsf - bbn - y_axis = tbn - bbn + print(">>>>B") + if layers1['direction_sense'] == 'POSITIVE': + pt = bbn.to_2d().to_3d() + x_axis = bsf - bbn + y_axis = tbn - bbn + else: + pt = bsn.to_2d().to_3d() + x_axis = bbf - bsn + y_axis = tsn - bsn else: if (connected_at_end and angle < 0) or (not connected_at_end and angle > 0): - pt = bbf.to_2d().to_3d() - x_axis = bsn - bbf - y_axis = tbf - bbf + if layers1['direction_sense'] == 'POSITIVE': + pt = bbf.to_2d().to_3d() + x_axis = bsn - bbf + y_axis = tbf - bbf + else: + pt = bsf.to_2d().to_3d() + x_axis = bbn - bsf + y_axis = tsf - bsf else: - pt = bbn.to_2d().to_3d() - x_axis = bsf - bbn - y_axis = tbn - bbn + if layers1['direction_sense'] == 'POSITIVE': + pt = bbn.to_2d().to_3d() + x_axis = bsf - bbn + y_axis = tbn - bbn + else: + pt = bsn.to_2d().to_3d() + x_axis = bbf - bsn + y_axis = tsn - bsn if connection1 != "ATEND": y_axis *= -1