Update app.py

app.py

@@ -604,6 +604,7 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
   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])
+  colorsUsed=[]
   for i in range(len(areas_Perimeters)):
       print(colorRanges)
       # colorRGB=hexRGB(color)
@@ -669,15 +670,15 @@ def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalC
       # x='#%02x%02x%02x' % (colorRanges[i])
       # xx='#%02x%02x%02x' % ( colorRanges[i][0] , colorRanges[i][1] , colorRanges[i][2] )
       # print( xx)
-  
-  s=( SimilarAreaDictionary.style.apply(
-        lambda col: ['background-color: %s' % ('#%02x%02x%02x' % ( colorRanges[i][0] , colorRanges[i][1] , colorRanges[i][2] )) for i in range(len(SimilarAreaDictionary))], 
-        subset=['Color']
-    ) )
+      colorsUsed.append(colorRanges[i])
+  # s=( SimilarAreaDictionary.style.apply(
+  #       lambda col: ['background-color: %s' % ('#%02x%02x%02x' % ( colorRanges[i][0] , colorRanges[i][1] , colorRanges[i][2] )) for i in range(len(SimilarAreaDictionary))], 
+  #       subset=['Color']
+  #   ) )
       # '#%02x%02x%02x' % (colorRanges[i])
 
 
-  return SimilarAreaDictionary, s
+  return SimilarAreaDictionary, colorsUsed
 
 
 
@@ -714,7 +715,7 @@ def drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag):
         counter+=1
 
       contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,num1,num2,flag,eachcolor) 
-      SimilarAreaDictionary ,s= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
+      SimilarAreaDictionary ,colorsUsed= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
 
       a = SimilarAreaDictionary.to_numpy()
 
@@ -821,7 +822,7 @@ def drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag):
       SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','Color','R','G','B'])
     contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag)
 
-    SimilarAreaDictionary , s= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
+    SimilarAreaDictionary , colorsUsed= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
 
     for contour in contourss:
 
@@ -895,7 +896,7 @@ def drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag):
 
   # apdf.write('b.pdf') 
   # annotationsDraw
-  return  imgPerimeter1,image_new1,SimilarAreaDictionary , s
+  return  imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed
 # drawAllContours(img,0,[],1.11,25579,'area') #,[190,47,250] ,[47,251,255] ,[80,240,15],[253,163,40]
 # imgPerimeter1,image_new1,Dictionary=drawAllContours(img,220,[47,251,255],[251,163,47],1.105,27233.5,'area')
 ###############################################
@@ -1071,12 +1072,12 @@ def legendGoogleSheets(SimilarAreaDictionary,colorsUsed):
   print(spreadsheet_url)
 
   return gc,spreadsheet_service,spreadsheetId
-gc,spreadsheet_service,spreadsheetId=legendGoogleSheets(SimilarAreaDictionary,colorsUsed)
+
 
 
 def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag):
 
-  imgPerimeter1,image_new1,Df2,s=drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag)
+  imgPerimeter1,image_new1,Df2,colorsUsed=drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag)
   # x = path.split("/")
   # x=x.pop()
   Df2=Df2.T
@@ -1095,7 +1096,8 @@ def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag):
       Df2=Df2.reindex(['MC-Template-Name','Perimeter', 'Occurences', 'Total Perimeter','Color', 'Unit'])
 
   # display(Df2)
-  return Df2, imgPerimeter1,image_new1 ,s 
+  gc,spreadsheet_service,spreadsheetId=legendGoogleSheets(Df2,colorsUsed)
+  return Df2, imgPerimeter1,image_new1 
 
 def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,color8,num1=0,num2=0):
   print(type(img))
@@ -1113,30 +1115,30 @@ def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,
     if radioButton=="Measure Full Image" :
      
       if radioButton1=='Area':
-        imgPerimeter1,image_new1,df ,s =drawAllContours(plan,green2,img,0,finalColorArray,num1,num2,'area')
+        imgPerimeter1,image_new1,df ,colorsUsed =drawAllContours(plan,green2,img,0,finalColorArray,num1,num2,'area')
         return image_new1
       else:
-        imgPerimeter1,image_new1,df ,s =drawAllContours(plan,green2,img,0,finalColorArray,num1,num2,'perimeter')
+        imgPerimeter1,image_new1,df ,colorsUsed =drawAllContours(plan,green2,img,0,finalColorArray,num1,num2,'perimeter')
         return imgPerimeter1
     else:   
       if radioButton1=='Area':
-        imgPerimeter1,image_new1,df ,s =drawAllContours(plan,green2,img,220,finalColorArray,num1,num2,'area') #rgbValue
+        imgPerimeter1,image_new1,df ,colorsUsed =drawAllContours(plan,green2,img,220,finalColorArray,num1,num2,'area') #rgbValue
         return image_new1
       else:
-        imgPerimeter1,image_new1,df ,s =drawAllContours(plan,green2,img,220,finalColorArray,num1,num2,'perimeter') #rgbValue
+        imgPerimeter1,image_new1,df ,colorsUsed =drawAllContours(plan,green2,img,220,finalColorArray,num1,num2,'perimeter') #rgbValue
         return imgPerimeter1
   else:
     if radioButton=="Measure Full Image":
       if radioButton1=='Area':
-        Dictionary, imgPerimeter1,image_new1 ,s =MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'area')
+        Dictionary, imgPerimeter1,image_new1 ,colorsUsed =MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'area')
       else:
-        Dictionary, imgPerimeter1,image_new1 ,s =MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'perimeter')
+        Dictionary, imgPerimeter1,image_new1 ,colorsUsed =MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'perimeter')
 
     else:
       if radioButton1=='Area':
-        Dictionary, imgPerimeter1,image_new1,s =MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'area')
+        Dictionary, imgPerimeter1,image_new1,colorsUsed =MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'area')
       else:
-        Dictionary, imgPerimeter1,image_new1,s =MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
+        Dictionary, imgPerimeter1,image_new1,colorsUsed =MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
 
     Dictionary=Dictionary.T
     s=s.to_html()
@@ -1166,13 +1168,13 @@ def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,i
 
 
     if num1!=0 and num2!=0:
-       imgPerimeter1,Dictionary , s= PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2)
+       imgPerimeter1,Dictionary , colorsUsed= PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2)
        imgPerimeter1=  cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
        if SaveOP:
             pushToDropbox(plan,imgPerimeter1,Dictionary)
        if check1:
             exportToExcel(plan,Dictionary)
-       return imgPerimeter1,Dictionary , s
+       return imgPerimeter1,Dictionary , colorsUsed
     else:
       area=PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
       area = cv2.cvtColor(area, cv2.COLOR_BGR2RGB)