Update app.py

app.py

@@ -3,7 +3,7 @@ from flask import Flask, render_template,request,flash , json, url_for,g , redir
 import os
 import json
 import fitz
-from PIL import Image  
+from PIL import Image
 import cv2
 import numpy as np
 import pilecaps_adr
@@ -221,17 +221,17 @@ def measureproject(result,dataDoc=0,img=0,dxffile=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,'single_double.pth',result[0],pdfpath, result[4]) #single_double.pth
+        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/' 
-        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='annotated-'+result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+        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)
         # 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()]
+        arr=[base64.b64encode(buffer).decode('utf-8') ,pdflink,spreadsheet_url,list1.to_dict(), df_doors.to_dict()]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
 
     #################################  -2.2- #################################
     # elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
@@ -469,6 +469,9 @@ def dltmarkupslegend():
     print('deletedrows',deletedrows)
     if section.startswith('1.0'):
         newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section,areaPermArr=areaPermArr)
+    elif section.startswith('2.8'):
+        newlgnd=google_sheet_Legend.delete3_2(deletedrows,SimilarAreaDictionary)
+        print('done wit 2.8 in deleting, didnt append yet ')
     else:
         newlgnd=google_sheet_Legend.deletefromlegend(deletedrows=deletedrows,SimilarAreaDictionarycopy=SimilarAreaDictionary, section=section)
     try:
@@ -476,7 +479,7 @@ def dltmarkupslegend():
         newlgnd1=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId ,pdfpath=pdfpth) #new legend
     except:
         print("An exception occurred")
-        time.sleep(10)
+        time.sleep(20)
         newlgnd1=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId,pdfpath=pdfpth)
 
     return jsonify('donee')
@@ -670,6 +673,7 @@ def cvtSummarytoXML(jsdata):
     # print(result[1])
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
+ 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________