Update app.py

app.py

@@ -38,7 +38,7 @@ import deploying_3_3
 import Doors_Schedule
 import Code_2_7
 import Counting_Columns_2_1
-# import Find_Hyperlinking_text
+import Find_Hyperlinking_text
 import ezdxf
 from flask import Flask, render_template, session, redirect, url_for
 from flask_session import Session  # Capital "S"
@@ -221,7 +221,7 @@ def getfromdropboxImg(jsdata):
     jsdata=eval(jsdata)
     print('pdfnameeee==',jsdata)
 
-    dbPath='/TSA JOBS/ADR Test/'+jsdata[0][0]+'/'+jsdata[0][1]+'/'+jsdata[0][2]+'/Measured Plan/'+'Measured_'+jsdata[1]
+    dbPath='/TSA JOBS/ADR Test/'+jsdata[0][0]+'/'+jsdata[0][1]+'/'+jsdata[0][2]+'/Measured Plan/'+jsdata[1]
     print(dbPath)
     dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
     md, res =dbxTeam.files_download(path=dbPath)
@@ -338,7 +338,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
                 # 
-                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname='Measured_'+result[0]) #doc=doc,pdfname=path,pdfpath=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]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
@@ -352,17 +352,18 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 print(temp_filename)
 
                 SearchArray=result[6]
+                Thickness=result[7]
                 print(result)
                 print("SearchArray = ",SearchArray)
                 global hatched_areas2_7
-                doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray, pdfpath,result[0])
+                doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,Thickness, pdfpath,result[0])
                 # global colorsused
                 hatched_areas2_7=hatched_areas 
                 colorsused=list(SimilarAreaDictionary['Color'])
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
                 # 
-                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname='Measured_'+result[0]) #doc=doc,pdfname=path,pdfpath=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,[],namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
@@ -382,9 +383,9 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         SearchArray=result[7]
         print('searchhh:',SearchArray)
         # 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
-        annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc,SearchArray)
+        annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
         dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
-        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname='Measured_'+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/
         _, buffer = cv2.imencode('.png', annotatedimg)
         repeatedLabelsReturn=''
         NotFoundReturn=''
@@ -597,7 +598,7 @@ def getimg(jsdata):
             doc,areaPixel,perimeterPixel,pdfdata=pixelconversion.drawisrotated(data) #  .openDrawPDF(data)
         yield f"data: 20\n\n"  # Initial progress
         dbPath='/TSA JOBS/ADR Test/'+jsdata[0]+'/'+jsdata[1]+'/'+jsdata[2]+'/'+'Scale Document' +'/'
-        dburl=tsadropboxretrieval.uploadanyFile(doc=doc,pdfname=str(jsdata[3]) ,path=dbPath)
+        dburl=tsadropboxretrieval.uploadanyFile(doc=doc,pdfname=str(jsdata[3]) ,path=dbPath) #PixelConv_
         # areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(dbPath, str(jsdata[3]))
         yield f"data: 40\n\n"  # Initial progress
         outputs=[areaPixel,perimeterPixel , dburl]
@@ -1000,7 +1001,6 @@ def cvtSummarytoXML(jsdata):
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
 
-
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________