Update app.py
Browse files
app.py
CHANGED
|
@@ -946,7 +946,7 @@ def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color
|
|
| 946 |
return imgPerimeter1,Dictionary
|
| 947 |
|
| 948 |
''' General measurement function'''
|
| 949 |
-
def getMeasurement(plan,SaveOP, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11
|
| 950 |
if plan==None:
|
| 951 |
area,perim,df=None,None,None
|
| 952 |
# elif 'foundation' in plan:
|
|
@@ -958,15 +958,14 @@ def getMeasurement(plan,SaveOP, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num
|
|
| 958 |
plan1='dropbox_plans/'+str(plan)
|
| 959 |
img=plan2img(plan1)
|
| 960 |
# area,perim,df=PileCaps(img)
|
| 961 |
-
if num1==0 and num2 ==0 :
|
| 962 |
-
|
| 963 |
-
|
| 964 |
-
areaPerimeterImg,df=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2)
|
| 965 |
# if SaveOP:
|
| 966 |
# pushToDropbox(plan,area,perim,df)
|
| 967 |
|
| 968 |
# return area,perim,df
|
| 969 |
-
return areaPerimeterImg
|
| 970 |
##########################################################
|
| 971 |
def update_dropdown(project):
|
| 972 |
|
|
|
|
| 946 |
return imgPerimeter1,Dictionary
|
| 947 |
|
| 948 |
''' General measurement function'''
|
| 949 |
+
def getMeasurement(plan,SaveOP, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11):
|
| 950 |
if plan==None:
|
| 951 |
area,perim,df=None,None,None
|
| 952 |
# elif 'foundation' in plan:
|
|
|
|
| 958 |
plan1='dropbox_plans/'+str(plan)
|
| 959 |
img=plan2img(plan1)
|
| 960 |
# area,perim,df=PileCaps(img)
|
| 961 |
+
# if num1==0 and num2 ==0 :
|
| 962 |
+
areaPerimeterImg=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
|
| 963 |
+
|
|
|
|
| 964 |
# if SaveOP:
|
| 965 |
# pushToDropbox(plan,area,perim,df)
|
| 966 |
|
| 967 |
# return area,perim,df
|
| 968 |
+
return areaPerimeterImg
|
| 969 |
##########################################################
|
| 970 |
def update_dropdown(project):
|
| 971 |
|