diff --git a/helix/models/corner.py b/helix/models/corner.py index 8c55640..24e474f 100644 --- a/helix/models/corner.py +++ b/helix/models/corner.py @@ -1,12 +1,13 @@ class Corner(object): - def __init__(self, x, y, length, angle): + def __init__(self, x, y, length_ccw, length_cw, angle): self.x = x self.y = y - self.length = length + self.length_ccw = length_ccw + self.length_cw = length_cw self.angle = angle @property def dictionary(self): - return {"x": self.x, "y": self.y, "length": self.length, "angle": self.angle} + return {"x": self.x, "y": self.y, "length ccw": self.length_ccw, "length cw : ": self.length_cw, "angle": self.angle} diff --git a/helix/presenters/panel_presenter.py b/helix/presenters/panel_presenter.py index 7cee812..81720f0 100644 --- a/helix/presenters/panel_presenter.py +++ b/helix/presenters/panel_presenter.py @@ -85,7 +85,8 @@ class ProjectPresenter(object): else: next_corner = building[i+1] - corner_length = sqrt((next_corner[0] - corner[0])**2 + (next_corner[1] - corner[1])**2) + corner_length_ccw = sqrt((next_corner[0] - corner[0])**2 + (next_corner[1] - corner[1])**2) + corner_length_cw = sqrt((previous_corner[0] - corner[0])**2 + (previous_corner[1] - corner[1])**2) k1 = (corner[1] - previous_corner[1]) / (corner[0] - previous_corner[0]) k2 = (next_corner[1] - corner[1]) / (next_corner[0] - corner[0]) theta2 = degrees(atan(k2)) @@ -100,7 +101,7 @@ class ProjectPresenter(object): theta1 = 180 + theta1 corner_angle = theta1 - presentable_building.append(Corner(corner[0], corner[1], corner_length, corner_angle).__dict__) + presentable_building.append(Corner(corner[0], corner[1], corner_length_ccw,corner_length_cw, corner_angle).__dict__) previous_corner = corner return result