Marthee commited on
Commit
53b3ee8
·
1 Parent(s): 90a2e6b

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +6 -6
app.py CHANGED
@@ -594,7 +594,7 @@ def getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color=[0,
594
  def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray,rgbcolor=[0,0,0],color=[0,0,0]):
595
  #fills dictionary with key areas and number of occurences
596
  print('wttttt')
597
- areas_Perimeters=sorted(getAreasPerimeter(img,number,num1,num2,flag,finalColorArray,color) )
598
  print(areas_Perimeters)
599
  indices=[]
600
  colorRanges=[[255,153,153],[51,255,51],[201,56,147],[255,0,0],[255,0,255],[0,102,204],[102,0,102],[153,0,76],[200,92,135],[52,161,99],[235,250,24],[40,30,170],[98,149,63],[100,30,179],[200,55,67],[150,80,200],[0,102,102],[250,28,191],[101,27,101],[230,150,76],[3,65,127],[114,39,39],[250,36,100],[180,30,40],[10,250,60],[140,30,253],[114,58,245],[47,255,255]]
@@ -674,7 +674,7 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
674
 
675
 
676
 
677
- return SimilarAreaDictionary,s
678
 
679
 
680
 
@@ -711,7 +711,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
711
  counter+=1
712
 
713
  contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,num1,num2,flag,eachcolor)
714
- SimilarAreaDictionary,s= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
715
 
716
  a = SimilarAreaDictionary.to_numpy()
717
 
@@ -812,13 +812,13 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
812
  else:
813
 
814
  if flag=='area':
815
- SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Area','Occurences','TotalArea','R','G','B']) #
816
 
817
  else:
818
- SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','R','G','B'])
819
  contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag)
820
 
821
- SimilarAreaDictionary,s= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
822
 
823
  for contour in contourss:
824
 
 
594
  def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray,rgbcolor=[0,0,0],color=[0,0,0]):
595
  #fills dictionary with key areas and number of occurences
596
  print('wttttt')
597
+ areas_Perimeters=sorted(getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color) )
598
  print(areas_Perimeters)
599
  indices=[]
600
  colorRanges=[[255,153,153],[51,255,51],[201,56,147],[255,0,0],[255,0,255],[0,102,204],[102,0,102],[153,0,76],[200,92,135],[52,161,99],[235,250,24],[40,30,170],[98,149,63],[100,30,179],[200,55,67],[150,80,200],[0,102,102],[250,28,191],[101,27,101],[230,150,76],[3,65,127],[114,39,39],[250,36,100],[180,30,40],[10,250,60],[140,30,253],[114,58,245],[47,255,255]]
 
674
 
675
 
676
 
677
+ return SimilarAreaDictionary
678
 
679
 
680
 
 
711
  counter+=1
712
 
713
  contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,num1,num2,flag,eachcolor)
714
+ SimilarAreaDictionary= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
715
 
716
  a = SimilarAreaDictionary.to_numpy()
717
 
 
812
  else:
813
 
814
  if flag=='area':
815
+ SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Area','Occurences','TotalArea','Color','R','G','B']) #
816
 
817
  else:
818
+ SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','Color','R','G','B'])
819
  contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag)
820
 
821
+ SimilarAreaDictionary= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
822
 
823
  for contour in contourss:
824