Marthee commited on
Commit
2555472
·
1 Parent(s): 6c7d570

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +4 -4
app.py CHANGED
@@ -947,7 +947,7 @@ def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color
947
  return imgPerimeter1,Dictionary
948
 
949
  ''' General measurement function'''
950
- def getMeasurement(plan,SaveOP, dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11):
951
  if plan==None:
952
  area,perim,df=None,None,None
953
  # elif 'foundation' in plan:
@@ -959,10 +959,10 @@ def getMeasurement(plan,SaveOP, dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11
959
  plan1='dropbox_plans/'+str(plan)
960
  img=plan2img(plan1)
961
  # area,perim,df=PileCaps(img)
962
- if in10==0 and in11 ==0 :
963
- areaPerimeterImg=PickColorContours(dp,img,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11):
964
  else:
965
- areaPerimeterImg,df=PickColorContours(dp,img,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11):
966
  # if SaveOP:
967
  # pushToDropbox(plan,area,perim,df)
968
 
 
947
  return imgPerimeter1,Dictionary
948
 
949
  ''' General measurement function'''
950
+ def getMeasurement(plan,SaveOP, dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2):
951
  if plan==None:
952
  area,perim,df=None,None,None
953
  # elif 'foundation' in plan:
 
959
  plan1='dropbox_plans/'+str(plan)
960
  img=plan2img(plan1)
961
  # area,perim,df=PileCaps(img)
962
+ if num1==0 and num2 ==0 :
963
+ areaPerimeterImg=PickColorContours(dp,img,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
964
  else:
965
+ areaPerimeterImg,df=PickColorContours(dp,img,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2)
966
  # if SaveOP:
967
  # pushToDropbox(plan,area,perim,df)
968