Update app.py

app.py

@@ -813,8 +813,12 @@ def stringToRGB():
                             page.set_rotation(0)
                         pix = page.get_pixmap(dpi=300)  # render page to an image
                         pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
-
-                        arr=measureproject(result=vv,img=pl,pdf_content=pdf_content)
+                        if 'file' not in request.files:
+                            print('error, No file part in the request')
+                        else: 
+                            csvfile = request.files['csvfile']
+                            print('csvfile done, measuring')
+                            arr=measureproject(result=vv,img=pl,pdf_content=pdf_content,csvfile=csvfile)
         
         else: 
             if ( vv[5][2].startswith('3.2') or vv[5][2].startswith('3.3') or vv[5][2].startswith('2.7')) :
@@ -884,7 +888,16 @@ def stringToRGB():
                     pix = page.get_pixmap(dpi=300)  # render page to an image
                     pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
                     pls.append(pl)
-                arr=measureproject(vv,dataDocs,pls)
+                arr=measureproject(vv,dataDocs,pls)    
+                
+                # ---- CSV FILE ----#
+                #if 'file' not in request.files:
+                 #   print('error, No file part in the request')
+                  #  arr=measureproject(vv,dataDocs,pls)
+                #else: 
+                 #   csvfile = request.files['csvfile']
+                  #  print('csvfile done, measuring')
+                #arr=measureproject(vv,dataDocs,pls,csvfile=csvfile)
             #pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(vv[0]))
             #dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
             #md, res =dbxTeam.files_download(path=pdfpath)
@@ -934,7 +947,7 @@ def measure2_1():
         return jsonify({"error": error_msg}), 500
 #MAIN FUNCTION -- calls python code to measure the chosen plan from the interface
 # @app.route('/projecttomeasure/<jsdata>',methods=["GET","POST"])
-def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
+def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0,csvfile=0):
     try:
         colorarr=[]
         global pdflink
@@ -1044,9 +1057,9 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
                     print("SearchArray = ",SearchArray)
                     global hatched_areas2_7
                     if pdf_content:
-                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,CorrectionRatio,points_Of_drawing_Canvas,Thickness, pdfpath,result[0],pdf_content)
+                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,CorrectionRatio,result[8],Thickness, pdfpath,result[0],pdf_content)
                     else:
-                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,CorrectionRatio,points_Of_drawing_Canvas,Thickness, pdfpath,result[0])
+                        doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas,bax_pretty_xml,column_xml=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,CorrectionRatio,result[8],Thickness, pdfpath,result[0])
                     # global colorsused
                     hatched_areas2_7=hatched_areas 
                     colorsused=list(SimilarAreaDictionary['Color'])
@@ -1073,7 +1086,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
             listofmarkups=[]
             SearchArray=result[7]
             print('searchhh:',SearchArray)
-
+            print('csv',csvfile)
             # 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
             if pdf_content:
                 link = urllib.parse.unquote(result[6].strip('"'))
@@ -1182,23 +1195,15 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 ######################################################### HELPER FUNCTIONS: MARTHE/OMAR #################################################################################################################################
-
-
-def drawonpdf(nameofpdf, coords):
+def drawonpdf(nameofpdf,coords):
     try:
-        print()
-        pdfpath, pdflink = tsadropboxretrieval.getPathtoPDF_File(nameofPDF=nameofpdf)
-        dbxTeam = tsadropboxretrieval.ADR_Access_DropboxTeam('user')
-        md, res = dbxTeam.files_download(path=pdfpath)
+        pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=nameofpdf)
+        dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+        md, res =dbxTeam.files_download(path=pdfpath)
         data = res.content
-        doc = fitz.open("pdf", data)
-        page = doc[0]
-        
-        # 1. Initialize a list to hold all your shape dictionaries
-        canvas_points_list = []
-
-        # Use enumerate to get a 1-based shape index
-        for index, shape in enumerate(coords, start=1):
+        doc = fitz.open("pdf",data)
+        page=doc[0]
+        for shape in coords:
             if not isinstance(shape, dict):
                 continue
 
@@ -1211,38 +1216,19 @@ def drawonpdf(nameofpdf, coords):
 
             # Convert to fitz.Point objects and apply derotation
             points = [fitz.Point(x, y) * page.derotation_matrix for x, y in vertices]
-            
-            # --- Convert to your desired format ---
-            # 1. Create the list of {'x': ..., 'y': ...} dictionaries
-            coordinates_list = [{"x": p.x, "y": p.y} for p in points]
-            
-            # 2. Create the final dictionary for this shape
-            shape_data = {
-                'shapeIndex': index,
-                'coordinates': coordinates_list
-            }
-            
-            # 3. Append this shape's dictionary to the main list
-            canvas_points_list.append(shape_data)
-            # --- End of conversion ---
 
             # --- 🟢 Use polygon annotation ---
             if len(points) > 2:
                 annot = page.add_polygon_annot(points)
             else:
                 annot = page.add_polyline_annot(points)
-            
+
             # Style annotation
             annot.set_colors(stroke=(1, 0, 0))  # red border
             annot.set_border(width=1)
             annot.update()
-            
         # doc.save("output.pdf")
-        
-        # # 4. Return the list of dictionaries
-        # print('pointsomar,',canvas_points_list)
-        return canvas_points_list
-
+        return annot
     except (ConnectionError, TimeoutError) as e:
         # Use app context when logging
         from flask import current_app
@@ -1256,8 +1242,8 @@ def drawonpdf(nameofpdf, coords):
             error_details = traceback.format_exc()
             error_msg = log_error(error_details, issue_type="backend")
         return jsonify({"error": error_msg}), 500
+    
 
- 
 ######################################################### GUI: CANVAS #################################################################################################################################
 @app.route("/canvaspdftoimgBackground/<jsdata>",methods=["GET", "POST"])
 def pdftoimgCanvas(jsdata):