Update app.py

app.py

@@ -590,13 +590,18 @@ def getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color=[0,
 
   return appended
 
+
 def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray,rgbcolor=[0,0,0],color=[0,0,0]):
   #fills dictionary with key areas and number of occurences
   print('wttttt')
   areas_Perimeters=sorted(getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color) )
   print(areas_Perimeters)
   indices=[]
+  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]]
+  print(colorRanges[0])
+  print(colorRanges[0][0],colorRanges[0][1], colorRanges[0][2])
   for i in range(len(areas_Perimeters)):
+      print(colorRanges)
       # colorRGB=hexRGB(color)
       item1 = areas_Perimeters[i][0]
       width1 = areas_Perimeters[i][1]
@@ -609,11 +614,12 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
       areaPerimeterMax= round(item1,1) + 0.3
       # print (areaMin, areaMax)
       if color != [0,0,0]: #colored images 
-        mydata=[round(item1,1),width1,height1,0, 1,0,[rgbcolor[0],rgbcolor[1],rgbcolor[2]],255, (width1/10+height1/10),(width1/5+height1/5)] 
-
+        mydata=[round(item1,1),width1,height1,0, 1,0,[rgbcolor[0],rgbcolor[1],rgbcolor[2] ],0,0,0] 
+        # mydata=[round(item1,1),width1,height1,0, 1,0,[rgbcolor[0],rgbcolor[1],rgbcolor[2] ],colorRanges[0][2],colorRanges[0][1],colorRanges[0][0]] 
+        # colorRanges.pop(0)
       else:
           # print('??')
-          mydata=[round(item1,1),width1,height1,0, 1,0 ,255, (width1/10+height1/10),(width1/5+height1/5)] 
+          mydata=[round(item1,1),width1,height1,0, 1,0 ,0,0,0] 
 
       # if (( round(item1,1)  in SimilarAreaDictionary['Rounded'].values) or (areaMin in  SimilarAreaDictionary['Rounded'].values )or (areaMax in SimilarAreaDictionary['Rounded'].values )):
       
@@ -643,19 +649,28 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
             if (SimilarAreaDictionary['Width'].loc[i] <=widthMax and SimilarAreaDictionary['Width'].loc[i] >= widthMin)  and (SimilarAreaDictionary['Height'].loc[i] <= heightMax  and SimilarAreaDictionary['Height'].loc[i] >= heightMin  ) or (SimilarAreaDictionary['Width'].loc[i] <=heightMax and SimilarAreaDictionary['Width'].loc[i] >= heightMin)  and (SimilarAreaDictionary['Height'].loc[i] <= widthMax  and SimilarAreaDictionary['Height'].loc[i] >= widthMin  ) :
                   checkifColorExists=1  #found and incremented
                   SimilarAreaDictionary['Occurences'].loc[i]+=1
-                  SimilarAreaDictionary['R'].loc[i] = 255
-                  SimilarAreaDictionary['G'].loc[i] =random.randrange(40, 100, 20)+ width1/10 +height1/10
-                  SimilarAreaDictionary['B'].loc[i] = random.randrange(20, 150, 40)+width1/10+width1/5 +height1/10
+                  # SimilarAreaDictionary['R'].loc[i] =colorRanges[0][2]
+                  # SimilarAreaDictionary['G'].loc[i] =colorRanges[0][1]
+                  # SimilarAreaDictionary['B'].loc[i] = colorRanges[0][0]
+
+        # colorRanges.pop(0)
 
         if checkifColorExists==0: #couldnt find the color , doesnt exist so add it 
           SimilarAreaDictionary.loc[len(SimilarAreaDictionary)] =mydata
-           
-      # else: #add item in df
-      #   SimilarAreaDictionary.loc[len(SimilarAreaDictionary)] =mydata
+
+  for i in range(len(SimilarAreaDictionary)):
+      SimilarAreaDictionary.loc[i, "R"] = colorRanges[i][0]
+      SimilarAreaDictionary.loc[i, "G"] = colorRanges[i][1]
+      SimilarAreaDictionary.loc[i, "B"] = colorRanges[i][2]
+
+
+
 
   return SimilarAreaDictionary
 
 
+
+
 def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
   # colors=[color,color1,color2,color3,color4,color5,color6,color7]
   # img=np.array(img)
@@ -834,7 +849,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
                         SimilarAreaDictionary['TotalArea'].loc[i]+=areaa
                         SimilarAreaDictionary['Area'].loc[i]=areaa
                         passed=1
-                        cv2.drawContours(imgArea1, [contour], 0, ( int(SimilarAreaDictionary['B'].loc[i]),  int(SimilarAreaDictionary['G'].loc[i]), 255), -1)
+                        cv2.drawContours(imgArea1, [contour], 0, ( int(SimilarAreaDictionary['B'].loc[i]),  int(SimilarAreaDictionary['G'].loc[i]), int(SimilarAreaDictionary['R'].loc[i])), -1)
           cv2.putText(imgtransparent1,'Area= '+str(areaa) + ' m', (x+50,y-10)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
           cv2.drawContours(imgArea1, [contour], 0, (0, 0, 255), 4)
         elif flag=='perimeter':