senaduka/old-krovovi-kalkulator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

added length in cw direction

Browse Source
This commit is contained in:
GotPPay
2017-12-25 10:39:02 +01:00
parent cc490fbc6a
commit ef186a3754
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
helix/models/corner.py
View File

@@ -1,12 +1,13 @@
class Corner(object): class Corner(object):
def __init__(self, x, y, length, angle): def __init__(self, x, y, length_ccw, length_cw, angle):
self.x = x self.x = x
self.y = y self.y = y
self.length = length self.length_ccw = length_ccw
self.length_cw = length_cw
self.angle = angle self.angle = angle
@property @property
def dictionary(self): 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}

5
helix/presenters/panel_presenter.py
View File

@@ -85,7 +85,8 @@ class ProjectPresenter(object):
else: else:
next_corner = building[i+1] 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]) k1 = (corner[1] - previous_corner[1]) / (corner[0] - previous_corner[0])
k2 = (next_corner[1] - corner[1]) / (next_corner[0] - corner[0]) k2 = (next_corner[1] - corner[1]) / (next_corner[0] - corner[0])
theta2 = degrees(atan(k2)) theta2 = degrees(atan(k2))
@@ -100,7 +101,7 @@ class ProjectPresenter(object):
theta1 = 180 + theta1 theta1 = 180 + theta1
corner_angle = 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 previous_corner = corner
return result return result