Update app.py

app.py

@@ -36,6 +36,7 @@ import mainDBAlaa
 import datetime
 import doors_fasterrcnn
 import deploying_3_3
+import Counting_Columns_2_1
 
 import ezdxf
 app = Flask(__name__)
@@ -191,7 +192,7 @@ def stringToRGB():
         arr=measureproject(vv,dataDoc,opencv_img)
        
 
-    if vv[5][2].startswith('2.8'):
+    if vv[5][2].startswith('2.8') or vv[5][2].startswith('2.1'):
         pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(vv[0]))
         dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
         md, res =dbxTeam.files_download(path=pdfpath)
@@ -275,24 +276,27 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         dpxlinks=[]
         legendLinks=[]
         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 , df_doors=doors_fasterrcnn.main_run(img,dataDoc,'separated_classes.pth',result[0],pdfpath, result[4]) #single_double.pth
+
+        annotatedimg,pdf_document,spreadsheet_url, list1 , df_doors=doors_fasterrcnn.main_run(img,dataDoc,'separated_classes_all.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)
-        # listofmarkups.append(list1.to_dict())
+        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
         _, 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(), df_doors.to_dict()]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
+
+    #################################  -2.1- #################################
+    elif result[5][2].startswith('2.1'): #section value - 2.8 floor finishes
+            #vv[0] array of pdf names
+        imgss=[] 
+        dpxlinks=[]
+        legendLinks=[]
+        listofmarkups=[]
+
+        annotatedimg,pdf_document,spreadsheet_url, list1 , df_doors=Counting_Columns_2_1.mainfun(dataDoc) 
+        
+        # dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
+        # pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
+        # _, buffer = cv2.imencode('.png', annotatedimg)
         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- #################################
@@ -301,18 +305,14 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         #
         #link (add this to ur code)
         #   pdflink= db.dropbox_upload_file(doc=doc,pdfname=path,pdfpath=pdfpath)
-        
         # gc,spreadsheet_service,spreadsheetId, spreadsheet_url , namepathArr= pilecaps_adr.legendGoogleSheets(df,plan ,pdfpath)
-
-
         #output img
         #  _, buffer = cv2.imencode('.png', outputimg)
-
         #let first result to be the img 
         #return results in arr=[base64.b64encode(buffer).decode('utf-8'),pdflink,spreadsheetId,spreadsheet_url] like the previous sections in the above lines 
-    elif result[5][2].startswith('2.1'): #section value - 2.1 frames
-        url = tameem2_1.mainfun( result[0], pdfpath)
-        return jsonify([url])
+    # elif result[5][2].startswith('2.1'): #section value - 2.1 frames
+    #     url = tameem2_1.mainfun( result[0], pdfpath)
+    #     return jsonify([url])
 
     return  arr
 #_________________________________________________________________________________________________________________________
@@ -541,17 +541,17 @@ def dltmarkupslegend():
     if section.startswith('1.0') or section.startswith('3.2') or section.startswith('3.3'):
         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)
+        newlgnd=google_sheet_Legend.deletedoors(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:
-        # print('newlgnd',newlgnd)
-        newlgnd1=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId ,pdfpath=pdfpth) #new legend
+            newlgnd=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId ,pdfpath=pdfpth) #new legend
     except:
+
         print("An exception occurred")
         time.sleep(20)
-        newlgnd1=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId,pdfpath=pdfpth)
+        newlgnd=google_sheet_Legend.legendGoogleSheets(SimilarAreaDictionary=newlgnd,path=path,spreadsheetId=spreadsheetId,pdfpath=pdfpth)
 
     return jsonify('donee')
 
@@ -745,6 +745,7 @@ def cvtSummarytoXML(jsdata):
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
  
+ 
 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________