Update app.py

app.py

@@ -45,7 +45,8 @@ prjnamesURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7
 prjpartsURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=34865056'
 prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=1751466819'
 
-
+global colorsused
+global pdflink
   
 @app.route("/",methods=["GET", "POST"])
 def getInfotoMeasure():
@@ -204,6 +205,7 @@ def measure2_1():
 # @app.route('/projecttomeasure/<jsdata>',methods=["GET","POST"])
 def measureproject(result,dataDoc=0,img=0,dxffile=0):
     colorarr=[]
+    global pdflink
     # result = json.loads(jsdata) 
     pdfpath='/'
     #################################  -1.0- #################################
@@ -219,6 +221,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
             colorarr.append(c)
         print('RATIOS=',result[3], result[4])
         # cv2.imwrite(img,'imgg.png')
+        # global pdflink
         imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed,spreadsheet_url, spreadsheetId,list1, pdflink, areas_Perimeters, namepathArr =pilecaps_adr.drawAllContours(dataDoc,img,result[1],colorarr, result[3], result[4], result[0],pdfpath)
         _, buffer = cv2.imencode('.png', image_new1)
         arr=[base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(),spreadsheet_url , spreadsheetId,colorsUsed,list1.to_dict(), pdflink, areas_Perimeters, namepathArr]
@@ -244,9 +247,13 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 temp_file.write(dxfpath)
                 temp_filename = temp_file.name
                 print(temp_filename)
+                
                 doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
+                global colorsused
+                colorsused=list(SimilarAreaDictionary['Color'])
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
+                # 
                 pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
 
                 _, buffer = cv2.imencode('.png', outputimg)
@@ -267,7 +274,9 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         annotatedimg,pdf_document,spreadsheet_url, list1 , df_doors=doors_fasterrcnn.main_run(dataDoc,'single_double.pth',result[0],pdfpath, result[4]) #single_double.pth
         
         dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
+        # global pdflink
         pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+        
         print(pdflink)
         # dpxlinks.append(pdflink)
         # legendLinks.append(spreadsheet_url)
@@ -342,9 +351,15 @@ def convert2img(path):
 def sendmctnametoLegend(jsdata):
     result = json.loads(jsdata)
     print(result)
-    summaryid=google_sheet_Legend.mapnametoLegend(result)
+    global pdflink
+    summaryid=google_sheet_Legend.mapnametoLegend(result,colorsused,pdflink)
     allreturns=[summaryid]
     return jsonify(allreturns)
+
+@app.route("/getguessednamepath/",methods=["GET", "POST"])
+def getguessedNames():
+    guessednamesDrpdwn=google_sheet_Legend.getallguessednames()
+    return jsonify(guessednamesDrpdwn)
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 #NOT USED (pixel conversion instead)
@@ -610,11 +625,6 @@ def checktables():
         a1 = table1N.to_numpy()
         row1 = np.where(a1 == projectname)
         prjid=a1[row1[0]][0][0]
-        # a2 = table2N.to_numpy()
-        # row2 = np.where(a2 == projectpart)
-      
-        # partid=a2[row2[0]][0][1]
-
         t3Diff1=table3[~table3.isin(table3N)].dropna()
         t3Diff=table3N[~table3N.isin(table3)].dropna()
      
@@ -724,7 +734,6 @@ def cvtSummarytoXML(jsdata):
     # print(result[1])
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
-
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________