Marthee commited on
Commit
e3f9142
·
1 Parent(s): 7ebbda6

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +17 -9
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(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]]
@@ -619,7 +619,7 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
619
  # colorRanges.pop(0)
620
  else:
621
  # print('??')
622
- mydata=[round(item1,1),width1,height1,0, 1,0 ,0,0,0]
623
 
624
  # if (( round(item1,1) in SimilarAreaDictionary['Rounded'].values) or (areaMin in SimilarAreaDictionary['Rounded'].values )or (areaMax in SimilarAreaDictionary['Rounded'].values )):
625
 
@@ -657,16 +657,24 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
657
 
658
  if checkifColorExists==0: #couldnt find the color , doesnt exist so add it
659
  SimilarAreaDictionary.loc[len(SimilarAreaDictionary)] =mydata
660
-
661
  for i in range(len(SimilarAreaDictionary)):
662
  SimilarAreaDictionary.loc[i, "R"] = colorRanges[i][0]
663
  SimilarAreaDictionary.loc[i, "G"] = colorRanges[i][1]
664
  SimilarAreaDictionary.loc[i, "B"] = colorRanges[i][2]
 
 
 
 
 
 
 
 
 
665
 
666
 
667
-
668
-
669
- return SimilarAreaDictionary
670
 
671
 
672
 
@@ -703,7 +711,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
703
  counter+=1
704
 
705
  contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,num1,num2,flag,eachcolor)
706
- SimilarAreaDictionary= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
707
 
708
  a = SimilarAreaDictionary.to_numpy()
709
 
@@ -810,7 +818,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
810
  SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','R','G','B'])
811
  contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag)
812
 
813
- SimilarAreaDictionary= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
814
 
815
  for contour in contourss:
816
 
@@ -883,7 +891,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
883
 
884
  # apdf.write('b.pdf')
885
  # annotationsDraw
886
- return imgPerimeter1,image_new1,SimilarAreaDictionary
887
  # drawAllContours(img,0,[],1.11,25579,'area') #,[190,47,250] ,[47,251,255] ,[80,240,15],[253,163,40]
888
  # imgPerimeter1,image_new1,Dictionary=drawAllContours(img,220,[47,251,255],[251,163,47],1.105,27233.5,'area')
889
 
 
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]]
 
619
  # colorRanges.pop(0)
620
  else:
621
  # print('??')
622
+ mydata=[round(item1,1),width1,height1,0, 1,0,' ' ,0,0,0]
623
 
624
  # if (( round(item1,1) in SimilarAreaDictionary['Rounded'].values) or (areaMin in SimilarAreaDictionary['Rounded'].values )or (areaMax in SimilarAreaDictionary['Rounded'].values )):
625
 
 
657
 
658
  if checkifColorExists==0: #couldnt find the color , doesnt exist so add it
659
  SimilarAreaDictionary.loc[len(SimilarAreaDictionary)] =mydata
660
+ s= SimilarAreaDictionary
661
  for i in range(len(SimilarAreaDictionary)):
662
  SimilarAreaDictionary.loc[i, "R"] = colorRanges[i][0]
663
  SimilarAreaDictionary.loc[i, "G"] = colorRanges[i][1]
664
  SimilarAreaDictionary.loc[i, "B"] = colorRanges[i][2]
665
+ # x='#%02x%02x%02x' % (colorRanges[i])
666
+ # xx='#%02x%02x%02x' % ( colorRanges[i][0] , colorRanges[i][1] , colorRanges[i][2] )
667
+ # print( xx)
668
+
669
+ s=( SimilarAreaDictionary.style.apply(
670
+ lambda col: ['background-color: %s' % ('#%02x%02x%02x' % ( colorRanges[i][0] , colorRanges[i][1] , colorRanges[i][2] )) for i in range(len(SimilarAreaDictionary))],
671
+ subset=['Color']
672
+ ) )
673
+ # '#%02x%02x%02x' % (colorRanges[i])
674
 
675
 
676
+
677
+ return SimilarAreaDictionary,s
 
678
 
679
 
680
 
 
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
 
 
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
 
 
891
 
892
  # apdf.write('b.pdf')
893
  # annotationsDraw
894
+ return imgPerimeter1,image_new1,s
895
  # drawAllContours(img,0,[],1.11,25579,'area') #,[190,47,250] ,[47,251,255] ,[80,240,15],[253,163,40]
896
  # imgPerimeter1,image_new1,Dictionary=drawAllContours(img,220,[47,251,255],[251,163,47],1.105,27233.5,'area')
897