Marthee commited on
Commit
ea300c9
·
1 Parent(s): 01458e8

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +6 -4
app.py CHANGED
@@ -581,8 +581,9 @@ def getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color=[0,
581
  if (area1 > 4000 ): #check perimeter kman fl condition -- 2800
582
  if num1!=0 and num2!=0:
583
  if flag=='area':
584
- addedMargin=area1+perimeter1*2
585
- areaa=round(addedMargin* (num1/(num2+perimeter1*2) ), 3) # true value of area of any shape/ area px value of same shape
 
586
  appended.append([areaa,width,height])
587
 
588
  else:
@@ -839,8 +840,9 @@ def drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag):
839
  heightMax= height+5
840
  if num1 !=0 and num2!=0:
841
  if flag=='area':
842
- addedMargin=area1+perimeter1*2
843
- areaa=round(addedMargin* (num1/(num2+perimeter1*2) ), 3) # true value of area of any shape/ area px value of same shape
 
844
  elif flag=='perimeter':
845
  perimeterr=round(perimeter1* (num1/num2 ), 3)
846
  else:
 
581
  if (area1 > 4000 ): #check perimeter kman fl condition -- 2800
582
  if num1!=0 and num2!=0:
583
  if flag=='area':
584
+ # addedMargin=area1+perimeter1*2
585
+ # areaa=round(addedMargin* (num1/(num2+perimeter1*2) ), 3) # true value of area of any shape/ area px value of same shape
586
+ areaa=round(area1*(num1/num2),3)
587
  appended.append([areaa,width,height])
588
 
589
  else:
 
840
  heightMax= height+5
841
  if num1 !=0 and num2!=0:
842
  if flag=='area':
843
+ # addedMargin=area1+perimeter1*2
844
+ # areaa=round(addedMargin* (num1/(num2+perimeter1*2) ), 3) # true value of area of any shape/ area px value of same shape
845
+ areaa=round(area1*(num1/num2),3)
846
  elif flag=='perimeter':
847
  perimeterr=round(perimeter1* (num1/num2 ), 3)
848
  else: