Update app.py

app.py

@@ -980,7 +980,7 @@ def createGoogleSheet():
 
 
 
-def legendGoogleSheets(path,SimilarAreaDictionary,colorsUsed):
+def legendGoogleSheets(path,SimilarAreaDictionary,colorsUsed, spreadsheetId,spreadsheet_service,gc):
 
 ########
   # legendTitle=getTitle(path)
@@ -1083,10 +1083,10 @@ def legendGoogleSheets(path,SimilarAreaDictionary,colorsUsed):
 
 
 
-def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag):
+def MainFunc( spreadsheetId,spreadsheet_service,gc,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)
+  gc,spreadsheet_service,spreadsheetId ,spreadsheet_url =legendGoogleSheets(plan,Df2,colorsUsed, spreadsheetId,spreadsheet_service,gc)
     # x = path.split("/")
   # x=x.pop()
   Df2=Df2.T
@@ -1108,7 +1108,7 @@ def MainFunc(plan,green2,img,dp,finalColorArray,number,num1,num2,flag):
   
   return Df2, imgPerimeter1,image_new1  , spreadsheet_url
 
-def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,color8,num1=0,num2=0):
+def PickColorContours( spreadsheetId,spreadsheet_service,gc,plan,dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,color8,num1=0,num2=0):
   print(type(img))
   green2=allpreSteps(img)
   
@@ -1139,15 +1139,15 @@ def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,
   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')
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url  =MainFunc( spreadsheetId,spreadsheet_service,gc,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')
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc( spreadsheetId,spreadsheet_service,gc,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')
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc( spreadsheetId,spreadsheet_service,gc,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')
+        Dictionary, imgPerimeter1,image_new1 ,spreadsheet_url=MainFunc( spreadsheetId,spreadsheet_service,gc,plan,green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
 
     Dictionary=Dictionary.T
     # s=s.to_html()
@@ -1159,7 +1159,7 @@ def PickColorContours(plan,dp,img,radioButton,radioButton1, color,color1,color2,
 
 ''' General measurement function'''
 def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1=0,num2=0):
-    
+    spreadsheetId,spreadsheet_service,gc=createGoogleSheet()
     if plan==None:
         area,perim,df=None,None,None
     elif 'foundation' in plan:
@@ -1177,16 +1177,16 @@ def getMeasurement(plan,SaveOP,check1, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,i
 
 
     if num1!=0 and num2!=0:
-       imgPerimeter1,Dictionary , spreadsheet_url = PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2)
+       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=  cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
        if SaveOP:
             pushToDropbox(plan,imgPerimeter1,Dictionary)
        if check1:
             exportToExcel(plan,Dictionary)
-       return  imgPerimeter1,Dictionary
+       return  imgPerimeter1,Dictionary , spreadsheet_url
        # return imgPerimeter1,Dictionary , gr.HTML.update(  """Click <a href=%s> on this Google Sheet </a> to continue to the Legend.""" %spreadsheet_url)
     else:
-      area=PickColorContours(plan1,dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12)
+      area=PickColorContours( spreadsheetId,spreadsheet_service,gc,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)
@@ -1234,8 +1234,8 @@ def saveExcel(Dictionary,plan):
     #   with gr.Accordion("User Guide "):
     #         gr.Markdown("Please read this before you use this tool. \n Note : The algorithm is based on detecting shapes from the plan. Some shapes such as tables and textboxes containing information about the plan may be seen as a shape and inserted into the algorithm as well. To avoid this, please clean up the plan before you choose to measure it by erasing them or drawing a white rectangle above them using any external tool. \n Please note that the pdfs inserted in this tab should be pile caps only.\n The tool is divided into two main parts:\n * First Part (until the measure button) \n - You will find three dropdowns. Choose the name of the project you want to measure, along with the project part, and the project section. \n - Then choose whether this project contains levels or not. If you wish to measure all of the plan choose Measure full image. If you wish to measure certain regions of the plan or divide the plan into regions please choose Measure Specific regions. \n - If you choose Measure specific regions, please draw shapes around the desired regions on Bluebeam or any external tool before choosing to measure this plan. \n Also, you should insert the colors in rgb format (Red-Green-Blue) of the levels. \n The output of the first part will be in the unit pixels. To convert the measurements into a metric unit. Please refer to the the second part for detailed information. \n * Second part (Unit Conversion - This occurs once only) \n - Choose one of the shapes of the measured plan (preferably the largest shape) and measure it in Bluebeam. \n - In the first field labeled Real value, please enter the value you obtained from the measurement you made on Bluebeam. \n - In the second field labeled Pixel value, enter the pixel value of the same shape in which you measured that is shown in the output of the first part. \n - The unit in which the conversion will be into. \n This creates a ratio so that the conversion would be as accurate as possible. You can think of this as the scale check logic in Bluebeam. \n Outputs:\n The first output is an image of the plan measured and color sorted. \n The second output is a representation of the Legend exported.\n The column named MC-Template Name is empty for you to enter the MC-T name. \n The column named Area is the area measured of one of the shape.\n The column named Occurences is the number of count of this shape - This is just to make sure every shape was seen correctly and thus summed later correctly.\n The column named Total Area contains the summed areas of each shape \n The column named Unit refers to the unit in which the conversion was made to.")
 with gr.Blocks(css="#search {background: green}") as mainBlock:
-  spreadsheetId,spreadsheet_service,gc=createGoogleSheet()
-  spreadsheet_url = "https://docs.google.com/spreadsheets/d/%s" % spreadsheetId
+  # spreadsheetId,spreadsheet_service,gc=createGoogleSheet()
+  # spreadsheet_url = "https://docs.google.com/spreadsheets/d/%s" % spreadsheetId
   with gr.Tab("Main UI"): 
       with gr.Row():
               # with gr.Column():
@@ -1305,7 +1305,7 @@ with gr.Blocks(css="#search {background: green}") as mainBlock:
   # 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=[drop, check,check1 ,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,in12,num1,num2],outputs=[out1,out2])
+  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)