Update app.py

app.py

@@ -1044,9 +1044,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,result[8],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,points_Of_drawing_Canvas,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,result[8],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,points_Of_drawing_Canvas,Thickness, pdfpath,result[0])
                     # global colorsused
                     hatched_areas2_7=hatched_areas 
                     colorsused=list(SimilarAreaDictionary['Color'])
@@ -1182,15 +1182,23 @@ 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:
-        pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=nameofpdf)
-        dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
-        md, res =dbxTeam.files_download(path=pdfpath)
+        print()
+        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]
-        for shape in coords:
+        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):
             if not isinstance(shape, dict):
                 continue
 
@@ -1203,19 +1211,38 @@ 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")
-        return annot
+        
+        # # 4. Return the list of dictionaries
+        # print('pointsomar,',canvas_points_list)
+        return canvas_points_list
+
     except (ConnectionError, TimeoutError) as e:
         # Use app context when logging
         from flask import current_app
@@ -1229,8 +1256,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):