Update app.py

app.py

@@ -1,19 +1,20 @@
 from __future__ import print_function
-from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify
+from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify , send_file
 import os
 import json
 import fitz
 from PIL import Image
 import cv2
-import numpy as np 
-import pilecaps_adr 
+import numpy as np
+import pilecaps_adr
 import base64
-from db import dropbox_connect 
+from db import dropbox_connect
 import db
 import cv2
 import pandas as pd
 import time
-from io import BytesIO
+from io import BytesIO, StringIO
+import tempfile
 from flask import Flask, Response
 from werkzeug.wsgi import wrap_file
 import tameem3_2
@@ -28,12 +29,13 @@ import MC_Templates_API
 import tsadropboxretrieval
 import doc_search
 import google_sheet_Legend
+import dxf__omar3_2
 import google_sheet_to_xml
 from threading import Thread
-# import mainDBAlaa
+import mainDBAlaa
 import datetime
 
-
+import ezdxf
 app = Flask(__name__)
 
 
@@ -134,17 +136,19 @@ def hexRGB(color):
 #_________________________________________________________________________________________________________________________
 @app.route('/savebase64Img/',methods=["POST"])
 def stringToRGB():
-    name = request.get_json()
-    vv=name.get('allvalues')
-    dataDoc = plan2img( str(vv[0]) )[1]
-    # vv[0] ->proj name, vv[1] (0/220),vv[2] ->colors , vv[3]->ratio1 , vv[4]->ratio2 , vv[5] -> pdfpath , vv[6] ->imgDrawnOn
+    vv = eval(request.form.get('answers'))
+    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']
+        arr=measureproject(vv,dataDoc,opencv_img,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)
-    else:
-    # vv[0] ->proj name, vv[1] (0/220),vv[2] ->colors , vv[3]->ratio1 , vv[4]->ratio2 , vv[5] -> pdfpath
-        opencv_img = plan2img( str(vv[0]) )[0]
+     
     arr=measureproject(vv,dataDoc,opencv_img)
     return jsonify(arr)
 
@@ -156,7 +160,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):
+def measureproject(result,dataDoc,img=0,dxffile=0):
     colorarr=[]
     # result = json.loads(jsdata) 
     pdfpath='/'
@@ -172,14 +176,24 @@ def measureproject(result,dataDoc,img=0):
             c=hexRGB(item)
             colorarr.append(c)
         print('RATIOS=',result[3], result[4])
+        # cv2.imwrite(img,'imgg.png')
         imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed,spreadsheet_url, spreadsheetId,list1, pdflink, areas_Perimeters, namepathArr =pilecaps_adr.drawAllContours(dataDoc,img,result[1],colorarr, result[3], result[4], result[0],pdfpath)
         _, buffer = cv2.imencode('.png', image_new1)
         arr=[base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(),spreadsheet_url , spreadsheetId,colorsUsed,list1.to_dict(), pdflink, areas_Perimeters, namepathArr]
    #################################  -3.2- #################################
     elif result[5][2].startswith('3.2'): #section value - 3.2 floor finishes
-        outputimg, df_merged , dropboxpdflink , spreadsheetId, spreadsheet_url  , list1 = tameem3_2.mainFunction(str(result[0]),result[3], result[4] , pdfpath) #pass arearatio,perimratio 
-        _, buffer = cv2.imencode('.png', outputimg)
-        arr=[ base64.b64encode(buffer).decode('utf-8') , df_merged.to_dict() , dropboxpdflink , spreadsheetId, spreadsheet_url , list1.to_dict()]
+        print('IN HEREEEE 3.2')
+        dxfpath=dxffile.read()
+        with tempfile.NamedTemporaryFile(suffix='.dxf', delete=False) as temp_file:
+            temp_file.write(dxfpath)
+            temp_filename = temp_file.name
+            print(temp_filename)
+            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
+            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,[],[],pdflink,[],namepathArr]# , 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
@@ -307,6 +321,26 @@ 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'
+    )
+    return response
+
+
 #PIXEL CONVERSION METHOD -- SAVES DOC ON DROPBOX TO BE MEASURED BY USER 
 @app.route("/pixelimg/<jsdata>",methods=["GET", "POST"])
 def getimg(jsdata):
@@ -315,15 +349,21 @@ def getimg(jsdata):
     pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=jsdata[3])
     dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
     md, res =dbxTeam.files_download(path=pdfpath)
-    print(pdfpath)
     data = res.content
-    doc=pixelconversion.drawisrotated(data) #  .openDrawPDF(data)
+    print('jsdata',jsdata)
+    if str(jsdata[2]).startswith('1.0'):
+        doc,areaPixel,perimeterPixel=pixelconversion.drawisrotated(data,300) #  .openDrawPDF(data)
+    else:
+        doc,areaPixel,perimeterPixel,pdfdata=pixelconversion.drawisrotated(data) #  .openDrawPDF(data)
     dbPath='/TSA JOBS/ADR Test/'+jsdata[0]+'/'+jsdata[1]+'/'+jsdata[2]+'/'+'Scale Document' +'/'
     dburl=tsadropboxretrieval.uploadanyFile(doc=doc,pdfname=str(jsdata[3]) ,path=dbPath)
-    areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(dbPath, str(jsdata[3]))
+    # areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(dbPath, str(jsdata[3]))
 
     outputs=[areaPixel,perimeterPixel , dburl]
-    return jsonify(outputs)
+    # pdf_data = io.BytesIO(res.content)
+    # pdf_data.seek(0)
+
+    return jsonify(outputs) #, send_file(pdf_data, as_attachment=True, mimetype='application/pdf', download_name='downloaded_file.pdf')
 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
@@ -595,7 +635,6 @@ def cvtSummarytoXML(jsdata):
 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
-
 def runn():
 #   app.run(host="127.0.0.1")
     from gevent.pywsgi import WSGIServer