Update app.py

app.py

@@ -619,12 +619,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] ],0,0,0] 
+        mydata=[[rgbcolor[0],rgbcolor[1],rgbcolor[2] ],round(item1,1),width1,height1,0, 1,0,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,' ' ,0,0,0] 
+          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 )):
       
@@ -701,9 +701,9 @@ def drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag):
   if number ==220:
     finalColorArray= colorOrder(img,finalColorArray)
     if flag== 'area':
-      SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Area','Occurences','TotalArea' , 'Color', 'R','G','B']) #
+      SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Area','Occurences','Total Area' , 'R','G','B']) #
     else:
-      SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter' , 'Color','R','G','B'])
+      SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Perimeter','Occurences','Total Perimeter' ,'R','G','B'])
     firstcolor=finalColorArray[0]
     # print(lastcolor)
     counter=0
@@ -816,10 +816,10 @@ def drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag):
   else:
 
     if flag=='area':
-      SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Area','Occurences','TotalArea','Color','R','G','B']) #
-
+      SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Area','Occurences','Total Area','R','G','B']) #
+      # print('generated')
     else:
-      SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','Color','R','G','B'])
+      SimilarAreaDictionary= pd.DataFrame(columns=['Color','Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','R','G','B'])
     contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag)
 
     SimilarAreaDictionary , colorsUsed= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)