Merge branch 'master' into remove-internal-corners
This commit is contained in:
@@ -2,6 +2,7 @@ import sys
|
||||
from math import sqrt, degrees, acos
|
||||
from helix.models.corner import Corner
|
||||
from helix.constants.global_constants import max_corner_angle
|
||||
import flask_featureflags as feature
|
||||
|
||||
class ProjectPresenter(object):
|
||||
def __init__(self, system_type, module_type):
|
||||
@@ -88,11 +89,10 @@ class ProjectPresenter(object):
|
||||
# True if cross is positive
|
||||
# False if negative or zero
|
||||
return x1 * y2 > x2 * y1
|
||||
|
||||
|
||||
|
||||
|
||||
result = []
|
||||
for building in buildings:
|
||||
if feature.is_active('ff_cpp'):
|
||||
for building in buildings:
|
||||
presentable_building = []
|
||||
result.append(presentable_building)
|
||||
|
||||
@@ -112,7 +112,6 @@ class ProjectPresenter(object):
|
||||
if (cross_sign(x1, y1, x2, y2)) and (theta < max_corner_angle) :
|
||||
#print('Inner Angle')
|
||||
presentable_building.append(Corner(ref[0], ref[1], corner_length_ccw,corner_length_cw, theta).__dict__)
|
||||
|
||||
return result
|
||||
|
||||
def get_max_y(self,buildings, panels):
|
||||
|
||||
Reference in New Issue
Block a user