Update dxf__omar3_2.py

dxf__omar3_2.py

@@ -49,6 +49,9 @@ from PyPDF2.generic import NameObject, TextStringObject, DictionaryObject, Float
 from typing import NewType
 from ctypes import sizeof
 
+from PyPDF2 import PdfReader, PdfWriter
+from PyPDF2.generic import NameObject, TextStringObject, FloatObject, DictionaryObject
+
 import numpy as np
 import cv2
 from matplotlib import pyplot as plt
@@ -75,6 +78,12 @@ import google_sheet_Legend
 from PyPDF2 import PdfReader
 from io import BytesIO
 
+from ezdxf.colors import aci2rgb
+from collections import Counter
+
+from math import isclose
+
+
 """## Notes"""
 
 #new approach to get width and height of dxf plan
@@ -1130,10 +1139,32 @@ def Create_DF(dxfpath,datadoc,hatched_areas,pdf_content=0):
   # print(SimilarAreaDictionary)
   return SimilarAreaDictionary
 """### Draw on Image and PDF"""
+def color_close_enough(c1, c2, threshold=10):
+    return all(abs(a - b) <= threshold for a, b in zip(c1, c2))
+
+
+
+def group_vertices(raw):
+    """Convert flat list [x1,y1,x2,y2,...] into [[x1,y1],[x2,y2],...]"""
+    if not raw or len(raw) < 2:
+        return []
+    return [[raw[i], raw[i+1]] for i in range(0, len(raw), 2)]
+
+
+def extract_measurement(obj):
+    """Extract numeric measurement from annotation's /Contents field."""
+    contents = obj.get("/Contents")
+    if not contents:
+        return None
+    # Find first numeric occurrence
+    text = str(contents)
+    m = re.search(r"([0-9]*\.?[0-9]+)", text)
+    return float(m.group(1)) if m else None
 
 def adjustannotations(OutputPdfStage1,text_with_positions):
   input_pdf_path = OutputPdfStage1
   output_pdf_path = "Final-WallsAdjusted.pdf"
+  annotations_data = []
 
   # Load the input PDF
   pdf_bytes_io = BytesIO(OutputPdfStage1)
@@ -1149,83 +1180,87 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
   writer.add_metadata(metadata)
 
   for page_index, page in enumerate(writer.pages):
-      if "/Annots" in page:
-          annotations = page["/Annots"]
-          for annot_index, annot in enumerate(annotations):
-              obj = annot.get_object()
-
-              # print("obj", obj)
-              # print(obj.get("/IT"))
-
-              if obj.get("/Subtype") == "/Line":
-                # print("AWL ANNOT IF")
-                # Check the /IT value to differentiate annotations
-                # if "/Contents" in obj and "m" in obj["/Contents"]:
-                if "/Subj" in obj and "Perimeter Measurement" in obj["/Subj"]:
-                    # print("Tany IF")
-                    obj.update({
-                        NameObject("/Measure"): DictionaryObject({
-                            NameObject("/Type"): NameObject("/Measure"),
-                            NameObject("/L"): DictionaryObject({
-                                NameObject("/G"): FloatObject(1),
-                                NameObject("/U"): TextStringObject("m"),  # Unit of measurement for area
-                            }),
+      if "/Annots" not in page:
+            continue
 
+        for annot in page["/Annots"]:
+            obj = annot.get_object()
+            subtype = obj.get("/Subtype")
+
+            # Group vertices for metadata
+            if subtype == "/Line":
+                raw_vertices = obj.get("/L", [])
+            else:
+                raw_vertices = obj.get("/Vertices", [])
+            vertices = group_vertices(raw_vertices)
+
+            # Normalize color
+            raw_color = obj.get("/C")
+            try:
+                annot_color = normalize_color(raw_color)
+            except:
+                annot_color = raw_color
+
+            # Extract measurement from annotation content
+            measurement = extract_measurement(obj)
+            # Assign to area or perimeter based on subtype
+            area = measurement if subtype == "/Polygon" else None
+            perimeter = measurement if subtype in ["/Line", "/PolyLine"] else None
+
+            # Match text and NBS
+            matched_text = None
+            matched_nbs = None
+            if subtype in ["/Line", "/PolyLine", "/Polygon"] and raw_color:
+                matched_entry = next(
+                    ((t, n) for t, n, _, c in text_with_positions if color_close_enough(annot_color, c)),
+                    (None, None)
+                )
+                matched_text, matched_nbs = matched_entry
+                combined = ""
+                if matched_text and matched_nbs:
+                    combined = f"{matched_text} - {matched_nbs}"
+                elif matched_text:
+                    combined = matched_text
+                elif matched_nbs:
+                    combined = matched_nbs
+                if combined:
+                    obj.update({NameObject("/T"): TextStringObject(combined)})
+
+            # Update annotation dictionaries for measurement type
+            if subtype == "/Line" and obj.get("/Subj", "") == "Perimeter Measurement":
+                obj.update({
+                    NameObject("/Measure"): DictionaryObject({
+                        NameObject("/Type"): NameObject("/Measure"),
+                        NameObject("/L"): DictionaryObject({
+                            NameObject("/G"): FloatObject(1),
+                            NameObject("/U"): TextStringObject("m"),
                         }),
-                        NameObject("/IT"): NameObject("/LineDimension"),  # Use more distinctive name
-                        NameObject("/Subj"): TextStringObject("Length Measurement"),   # Intent explicitly for Area
-                    })
-              # print(obj)
-
-              if obj.get("/Subtype") in ["/Line", "/PolyLine"] and "/C" in obj:
-                  # Normalize and match the color
-                  annot_color = normalize_color(obj["/C"])
-                  matched_entry = next(
-                      ((text, NBS) for text,NBS, _, color in text_with_positions if color_close_enough(annot_color, color)),
-                      (None, None)
-                  )
-                  # print("matched_entry = ",matched_entry)
-                  matched_text, matched_nbs = matched_entry
-
-                  combined_text = ""
-                  if matched_text and matched_nbs:
-                      combined_text = f"{matched_text} - {matched_nbs}"
-                  elif matched_text:
-                      combined_text = matched_text
-                  elif matched_nbs:
-                      combined_text = matched_nbs
-
-                  obj.update({
-                        NameObject("/T"): TextStringObject(combined_text),  # Custom text for "Comment" column
-                    })
-                  
-              elif (obj.get("/Subtype") == "/Polygon" and "/C" in obj):
-                  # Normalize and match the color
-                  annot_color = normalize_color(obj["/C"])
-                  # print("annot_color = ",annot_color)
-                  # print("LASTarray = ",text_with_positions)
-                  # matched_entry = next(
-                  #     ((text, NBS) for text,NBS, _, color in text_with_positions if annot_color == color),
-                  #     (None, None)
-                  # )
-                  matched_entry = next(
-                      ((text, NBS) for text,NBS, _, color in text_with_positions if color_close_enough(annot_color, color)),
-                      (None, None)
-                  )
-                  # print("matched_entry = ",matched_entry)
-                  matched_text, matched_nbs = matched_entry
-
-                  combined_text = ""
-                  if matched_text and matched_nbs:
-                      combined_text = f"{matched_text} - {matched_nbs}"
-                  elif matched_text:
-                      combined_text = matched_text
-                  elif matched_nbs:
-                      combined_text = matched_nbs
-
-                  obj.update({
-                        NameObject("/T"): TextStringObject(combined_text),  # Custom text for "Comment" column
-                    })
+                    }),
+                    NameObject("/IT"): NameObject("/LineDimension"),
+                    NameObject("/Subj"): TextStringObject("Length Measurement"),
+                })
+            if subtype == "/Polygon" and obj.get("/Subj", "") == "Area Measurement":
+                obj.update({
+                    NameObject("/Measure"): DictionaryObject({
+                        NameObject("/Type"): NameObject("/Measure"),
+                        NameObject("/Area"): DictionaryObject({
+                            NameObject("/G"): FloatObject(1),
+                            NameObject("/U"): TextStringObject("sq m"),
+                        }),
+                    }),
+                    NameObject("/IT"): NameObject("/Area_Annotation"),
+                    NameObject("/Subj"): TextStringObject("Area Measurement"),
+                })
+
+            # Append metadata
+            annotations_data.append([
+                 vertices,
+                 area,
+                 perimeter,
+                 annot_color,
+                 matched_text,
+                 matched_nbs,
+            ])
 
 
 
@@ -1234,7 +1269,7 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
   output_pdf_io.seek(0)
 
   print(f"Annotations updated and saved to {output_pdf_path}")
-  return output_pdf_io.read()
+  return output_pdf_io.read() , annotations_data
 
   
 
@@ -1487,7 +1522,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,pdfpath=0,pdfna
   # doc.save(OutputPdfStage1)
   modified_pdf_data = doc.tobytes()
   # OutputPdfStage2=adjustannotations(modified_pdf_data)
-  OutputPdfStage2=adjustannotations(modified_pdf_data,Legendarray)
+  OutputPdfStage2,annotations_data=adjustannotations(modified_pdf_data,Legendarray)
 
 
   # with open("Adjusted_PDF.pdf", "wb") as f: