Update app.py

app.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify , send_file
+from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify , send_file ,make_response
 import os
 import json
 import fitz
@@ -34,6 +34,7 @@ import google_sheet_to_xml
 from threading import Thread
 import mainDBAlaa
 import datetime
+import doors_fasterrcnn
 
 import ezdxf
 app = Flask(__name__)
@@ -137,27 +138,32 @@ def hexRGB(color):
 @app.route('/savebase64Img/',methods=["POST"])
 def stringToRGB():
     vv = eval(request.form.get('answers'))
+    
     if vv[5][2].startswith('3.2'):
         print('3.2 section')
         pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=vv[0])
         dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
         md, res =dbxTeam.files_download(path=pdfpath)
         dataDoc = res.content
-    else:
+        if 'file' not in request.files:
+            print('error, No file part in the request')
+        else: 
+            file = request.files['file']
+            print('file done, measuring')
+            arr=measureproject(vv,dataDoc,0,file)
+            return jsonify(arr)
+        
+    if vv[5][2].startswith('1.0'):
         opencv_img,dataDoc = plan2img( str(vv[0]) )
-    if 'file' not in request.files:
-        print('error, No file part in the request')
-    else: 
-        file = request.files['file']
-        print('file done, measuring')
-        arr=measureproject(vv,dataDoc,0,file)
-        return jsonify(arr)
-    if vv[1]==220:
-        imgdata = base64.b64decode(vv[6])
-        img=Image.open(io.BytesIO(imgdata))
-        opencv_img= cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR)
-     
-    arr=measureproject(vv,dataDoc,opencv_img)
+        if vv[1]==220:
+            imgdata = base64.b64decode(vv[6])
+            img=Image.open(io.BytesIO(imgdata))
+            opencv_img= cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR)
+        arr=measureproject(vv,dataDoc,opencv_img)
+       
+
+    if vv[5][2].startswith('2.8'):
+        arr=measureproject(vv)
     return jsonify(arr)
 
 @app.route('/2.1Trial/',methods=["POST"])
@@ -168,7 +174,7 @@ def measure2_1():
     return arr
 #MAIN FUNCTION -- calls python code to measure the chosen plan from the interface
 # @app.route('/projecttomeasure/<jsdata>',methods=["GET","POST"])
-def measureproject(result,dataDoc,img=0,dxffile=0):
+def measureproject(result,dataDoc=0,img=0,dxffile=0):
     colorarr=[]
     # result = json.loads(jsdata) 
     pdfpath='/'
@@ -197,12 +203,28 @@ def measureproject(result,dataDoc,img=0,dxffile=0):
             temp_filename = temp_file.name
             print(temp_filename)
             doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
-            print('done measuring')
             dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
             pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
 
             _, buffer = cv2.imencode('.png', outputimg)
             arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
+   #################################  -2.8- #################################
+    elif result[5][2].startswith('2.8'): #section value - 2.8 floor finishes
+            #vv[0] array of pdf names
+        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=doors_fasterrcnn.main_run(dataDoc,'combined.pth',result[0][i])
+
+            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)
+
+            _, buffer = cv2.imencode('.png', annotatedimg)
+            arr=[ base64.b64encode(buffer).decode('utf-8'),pdflink]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
+
     #################################  -2.2- #################################
     # elif result[5][2].startswith('2.2'): #section value - 2.2 rc slabs
         #add here python code
@@ -332,21 +354,21 @@ def modifyingcalcRefDynamic(img):
 
 @app.route('/get-pdf/<jsdata>')
 def get_pdf(jsdata):
+
     # Download PDF from Dropbox
     pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=jsdata)
     dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
     md, res =dbxTeam.files_download(path=pdfpath) 
-    # Convert res.content to a BytesIO object
-    pdf_stream = io.BytesIO(res.content)
-    # Attempt to seek to the beginning of the BytesIO stream
-    pdf_stream.seek(0)
-    # Send file
-    response = send_file(
-        pdf_stream,
-        as_attachment=True,
-        mimetype='application/pdf',
-        download_name='downloaded_file.pdf'
-    )
+
+    doc = fitz.open("pdf",res.content)
+    page=doc[0]
+    # print('get pdf size::',page.mediabox)
+
+    pdf_data = res.content  # Ensure this is your correct PDF data from Dropbox
+    response = make_response(io.BytesIO(pdf_data).getvalue())
+    response.headers.set('Content-Type', 'application/pdf')
+    response.headers.set('Content-Disposition', 'attachment', filename='filename.pdf')  # Replace with your desired file name
+    # return response
     return response
 
 
@@ -640,7 +662,7 @@ def cvtSummarytoXML(jsdata):
     # print(result[1])
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
-
+ 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________