Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
|
@@ -212,22 +212,23 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
|
|
| 212 |
elif result[5][2].startswith('2.8'): #section value - 2.8 floor finishes
|
| 213 |
#vv[0] array of pdf names
|
| 214 |
imgss=[]
|
| 215 |
-
|
|
|
|
| 216 |
for i in range(len(result[0])):
|
| 217 |
dbpdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=result[0][i])
|
| 218 |
dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
|
| 219 |
md, res =dbxTeam.files_download(path=dbpdfpath)
|
| 220 |
dataDoc = res.content
|
| 221 |
-
annotatedimg,pdf_document=doors_fasterrcnn.main_run(dataDoc,'combined.pth',result[0][i])
|
| 222 |
|
| 223 |
dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
|
| 224 |
pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='annotated-'+result[0][i]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
|
| 225 |
print(pdflink)
|
| 226 |
-
|
| 227 |
-
|
| 228 |
_, buffer = cv2.imencode('.png', annotatedimg)
|
| 229 |
imgss.append(base64.b64encode(buffer).decode('utf-8'))
|
| 230 |
-
arr=[imgss ,
|
| 231 |
|
| 232 |
################################# -2.2- #################################
|
| 233 |
# elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
|
|
@@ -667,6 +668,7 @@ def cvtSummarytoXML(jsdata):
|
|
| 667 |
xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
|
| 668 |
return jsonify(xmllink)
|
| 669 |
|
|
|
|
| 670 |
#_________________________________________________________________________________________________________________________
|
| 671 |
#_________________________________________________________________________________________________________________________
|
| 672 |
|
|
|
|
| 212 |
elif result[5][2].startswith('2.8'): #section value - 2.8 floor finishes
|
| 213 |
#vv[0] array of pdf names
|
| 214 |
imgss=[]
|
| 215 |
+
dpxlinks=[]
|
| 216 |
+
legendLinks=[]
|
| 217 |
for i in range(len(result[0])):
|
| 218 |
dbpdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=result[0][i])
|
| 219 |
dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
|
| 220 |
md, res =dbxTeam.files_download(path=dbpdfpath)
|
| 221 |
dataDoc = res.content
|
| 222 |
+
annotatedimg,pdf_document,spreadsheet_url=doors_fasterrcnn.main_run(dataDoc,'combined.pth',result[0][i],pdfpath)
|
| 223 |
|
| 224 |
dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
|
| 225 |
pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='annotated-'+result[0][i]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
|
| 226 |
print(pdflink)
|
| 227 |
+
dpxlinks.append(pdflink)
|
| 228 |
+
legendLinks.append(spreadsheet_url)
|
| 229 |
_, buffer = cv2.imencode('.png', annotatedimg)
|
| 230 |
imgss.append(base64.b64encode(buffer).decode('utf-8'))
|
| 231 |
+
arr=[imgss ,dpxlinks,legendLinks]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
|
| 232 |
|
| 233 |
################################# -2.2- #################################
|
| 234 |
# elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
|
|
|
|
| 668 |
xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
|
| 669 |
return jsonify(xmllink)
|
| 670 |
|
| 671 |
+
|
| 672 |
#_________________________________________________________________________________________________________________________
|
| 673 |
#_________________________________________________________________________________________________________________________
|
| 674 |
|