print to browser console ; remove magic numbers ; improve tests

This commit is contained in:
GotPPay
2017-12-26 20:58:00 +01:00
parent b71eb244af
commit 627e31ef37
5 changed files with 31 additions and 32 deletions

View File

@@ -1,6 +1,7 @@
import sys
from math import sqrt, atan, degrees
from helix.models.corner import Corner
from helix.constants.global_constants import max_corner_angle
class ProjectPresenter(object):
def __init__(self, system_type, module_type):
@@ -85,6 +86,8 @@ class ProjectPresenter(object):
else:
next_corner = building[i+1]
#x coordinate is stored as first element of corner variable
#y coordinate is stored as second element of corner variable
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)
@@ -103,12 +106,11 @@ class ProjectPresenter(object):
if (k1 > 0 and k2 > 0):
theta1 = 180 + theta1
if (theta1 < 135):
if (theta1 < max_corner_angle):
presentable_building.append(Corner(corner[0], corner[1], corner_length_ccw,corner_length_cw, theta1).__dict__)
previous_corner = corner
return result
def get_max_y(self,buildings, panels):