Update app.py

app.py

@@ -978,7 +978,7 @@ def createGoogleSheet():
 
 
 
-def legendGoogleSheets(path,SimilarAreaDictionary,colorsUsed,spreadsheetId,spreadsheet_service,gc):
+def legendGoogleSheets(path,SimilarAreaDictionary,colorsUsed):
 
 ########
   # legendTitle=getTitle(path)
@@ -1081,10 +1081,10 @@ def legendGoogleSheets(path,SimilarAreaDictionary,colorsUsed,spreadsheetId,sprea
 
 
 
-def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag,spreadsheetId,spreadsheet_service,gc):
+def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag):
 
   imgPerimeter1,image_new1,Df2,colorsUsed=drawAllContours(plan,green2,img,number,finalColorArray,num1,num2,flag)
-  gc,spreadsheet_service,spreadsheetId ,spreadsheet_url =legendGoogleSheets(plan,Df2,colorsUsed,spreadsheetId,spreadsheet_service,gc)
+  gc,spreadsheet_service,spreadsheetId ,spreadsheet_url =legendGoogleSheets(plan,Df2,colorsUsed)
     # x = path.split("/")
   # x=x.pop()
   Df2=Df2.T
@@ -1106,7 +1106,7 @@ def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag,spreadshee
   
   return Df2, imgPerimeter1,image_new1  , spreadsheet_url
 
-def PickColorContours(spreadsheetId,spreadsheet_service,gc,plan,dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,color8,num1=0,num2=0):
+def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,color8,num1=0,num2=0):
   print(type(img))
   green2=allpreSteps(img)
   
@@ -1137,15 +1137,15 @@ def PickColorContours(spreadsheetId,spreadsheet_service,gc,plan,dp,img,radioButt
   else:
     if radioButton=="Measure Full Image":
       if radioButton1=='Area':
-        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url  =MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'area',spreadsheetId,spreadsheet_service,gc)
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url  =MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'area')
       else:
-        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'perimeter',spreadsheetId,spreadsheet_service,gc)
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc(plan,green2,img,dp,finalColorArray,0,num1,num2,'perimeter')
 
     else:
       if radioButton1=='Area':
-        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'area',spreadsheetId,spreadsheet_service,gc)
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'area')
       else:
-        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter',spreadsheetId,spreadsheet_service,gc)
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc(plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
 
     Dictionary=Dictionary.T
     # s=s.to_html()
@@ -1156,7 +1156,7 @@ def PickColorContours(spreadsheetId,spreadsheet_service,gc,plan,dp,img,radioButt
     return imgPerimeter1,Dictionary ,spreadsheet_url
 
 ''' General measurement function'''
-def getMeasurement(spreadsheetId,spreadsheet_service,gc,plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1=0,num2=0):
+def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1=0,num2=0):
     
     if plan==None:
         area,perim,df=None,None,None
@@ -1175,7 +1175,7 @@ def getMeasurement(spreadsheetId,spreadsheet_service,gc,plan,SaveOP,check1, dp,i
 
 
     if num1!=0 and num2!=0:
-       imgPerimeter1,Dictionary , spreadsheet_url = PickColorContours(spreadsheetId,spreadsheet_service,gc,plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2)
+       imgPerimeter1,Dictionary , spreadsheet_url = 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)
@@ -1183,7 +1183,7 @@ def getMeasurement(spreadsheetId,spreadsheet_service,gc,plan,SaveOP,check1, dp,i
             exportToExcel(plan,Dictionary)
        return imgPerimeter1,Dictionary 
     else:
-      area=PickColorContours(spreadsheetId,spreadsheet_service,gc,plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
+      area=PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
       area = cv2.cvtColor(area, cv2.COLOR_BGR2RGB)
       # if SaveOP:
       #   pushToDropbox(plan, area)
@@ -1293,13 +1293,13 @@ with gr.Blocks(css="#search {background: orangered}") as mainBlock:
       buttonSaveDf=gr.Button("Save dataframe")
       
   #  getMeasurement(plan,SaveOP) #drop, check
-  show_button.click(fn=getMeasurement, inputs=[ spreadsheetId,spreadsheet_service,gc,drop, check ,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12],outputs=img1)
+  show_button.click(fn=getMeasurement, inputs=[drop, check ,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12],outputs=img1)
   buttonSaveDf.click(fn=saveExcel,inputs=[out2,project])
     # clr_btn.click(fn=clear,outputs=[project,radio_button,check,drop])
   # btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
   #secoond part 
   # btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
-  btn.click(fn=getMeasurement, inputs=[ spreadsheetId,spreadsheet_service,gc,drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2],outputs=[out1,out2,out3])
+  btn.click(fn=getMeasurement, inputs=[drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2],outputs=[out1,out2,out3])
   project.change(fn=update_dropdown, inputs=[project], outputs=drop)
 
 mainBlock.launch(debug=True,enable_queue=True)