Update app.py

app.py

@@ -480,9 +480,15 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
                 SearchArray=result[6]
                 
                 if pdf_content:
-                    doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray, pdfpath,result[0],pdf_content)
+                    if section.startswith('3.3'):
+                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas =deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray, pdfpath,result[0],pdf_content)
+                    else:
+                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_pretty_xml, column_xml=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray, pdfpath,result[0],pdf_content)
                 else:
-                    doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,pdfpath,result[0])
+                    if section.startswith('3.3'):
+                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas =deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,pdfpath,result[0])
+                    else:
+                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas, bax_pretty_xml, column_xml=dxf__omar3_2.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,pdfpath,result[0])
                 global colorsused
                 colorsused=list(SimilarAreaDictionary['Color'])
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
@@ -494,7 +500,10 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
                 pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=nameofpdf)
 
                 _, 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()]
+                if section.startswith('3.3'):
+                    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()]
+                else:
+                    arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr, base64.b64encode(bax_pretty_xml.encode("utf-8")).decode("utf-8"), base64.b64encode(column_xml.encode("utf-8")).decode("utf-8")]
     #################################  2.7- #################################
     elif section.startswith('2.7') : #section value - 2.7 floor finishes
             print('code of 2.7')
@@ -550,23 +559,29 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
 
                 pdf_contentSched = BytesIO(response.content)
                 # pdf_contentSched = fitz.open(stream=pdf_contentSched, filetype="pdf")
-                annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(pdf_contentSched, dataDoc, SearchArray,pdf_content,pdf_contentSched)
+                annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(pdf_contentSched, dataDoc, SearchArray,pdf_content,pdf_contentSched)
         else:
             pdfpathDoors,_=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(result[6]))
             dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
             md, resDoors =dbxTeam.files_download(path=pdfpathDoors)
             dataDocDoorsSchedule = resDoors.content 
-            annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
+            annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
+            
         dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
         pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname="combined_output.pdf") #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
-        _, buffer = cv2.imencode('.png', annotatedimg)
+        
         repeatedLabelsReturn=''
         NotFoundReturn=''
         if len(repeated_labels)>0:
             repeatedLabelsReturn=repeated_labels
         if len(not_found)>0:
             NotFoundReturn=not_found # , spreadsheetId, spreadsheet_url , list1.to_dict()]
-        arr=[base64.b64encode(buffer).decode('utf-8') ,pdflink,list1.to_dict(),str(repeatedLabelsReturn), str(NotFoundReturn)] # , spreadsheetId, spreadsheet_url , list1.to_dict()]
+        annotatedimgsBuffered=[]
+        for b in annotatedimgs:
+            _, buffer = cv2.imencode('.png', annotatedimg)
+            base64.b64encode(buffer).decode('utf-8')
+            annotatedimgsBuffered.append(buffer)
+        arr=[ annotatedimgsBuffered ,pdflink,list1.to_dict(),str(repeatedLabelsReturn), str(NotFoundReturn) , bax_pretty_xml, column_xml] # , spreadsheetId, spreadsheet_url , list1.to_dict()]
     #################################  -2.1- #################################
     elif section.startswith('2.1'): #section value - 2.8 floor finishes
             #vv[0] array of pdf names
@@ -710,6 +725,8 @@ def modifyingcalcRefDynamic(img):
     return area, perimeter, blk , imgcopy
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
+
+#
 @app.route('/downloadPDFfromLink')
 def downloadPDFfromLinkFunc():
     encoded_url = request.args.get('url')