Update app.py

app.py

@@ -214,21 +214,24 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         imgss=[]
         dpxlinks=[]
         legendLinks=[]
-        for i in range(len(result[0])):
-            dbpdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=result[0][i])
-            dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
-            md, res =dbxTeam.files_download(path=dbpdfpath)
-            dataDoc = res.content
-            annotatedimg,pdf_document,spreadsheet_url=doors_fasterrcnn.main_run(dataDoc,'combined.pth',result[0][i],pdfpath)
-           
-            dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
-            pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='annotated-'+result[0][i]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
-            print(pdflink)
-            dpxlinks.append(pdflink)
-            legendLinks.append(spreadsheet_url)
-            _, buffer = cv2.imencode('.png', annotatedimg)
-            imgss.append(base64.b64encode(buffer).decode('utf-8'))
-        arr=[imgss ,dpxlinks,legendLinks]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
+        listofmarkups=[]
+        print('RATIOS=',result[4])
+        # for i in range(len(result[0])):
+        dbpdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=result[0])
+        dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+        md, res =dbxTeam.files_download(path=dbpdfpath)
+        dataDoc = res.content
+        annotatedimg,pdf_document,spreadsheet_url, list1=doors_fasterrcnn.main_run(dataDoc,'combined.pth',result[0],pdfpath, result[4]) #single_double.pth
+        
+        dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
+        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='annotated-'+result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+        print(pdflink)
+        # dpxlinks.append(pdflink)
+        # legendLinks.append(spreadsheet_url)
+        # listofmarkups.append(list1.to_dict())
+        _, buffer = cv2.imencode('.png', annotatedimg)
+        # imgss.append(base64.b64encode(buffer).decode('utf-8'))
+        arr=[base64.b64encode(buffer).decode('utf-8') ,pdflink,spreadsheet_url,list1.to_dict()]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
 
     #################################  -2.2- #################################
     # elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
@@ -667,8 +670,6 @@ def cvtSummarytoXML(jsdata):
     # print(result[1])
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
- 
- 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________