Upload 5 files

Code_2_7.py

@@ -236,7 +236,7 @@ def generate_annotation_xml_block(vertices, area_text, author, custom_data: dict
     now = datetime.datetime.utcnow()
     mod_date = now.strftime("D:%Y%m%d%H%M%S+00'00'")
     creation_date = now.isoformat() + 'Z'
-    id_str = "fitz-" + uuid.uuid4().hex[:4].upper()
+    id_str = generate_bb_objptr()# "fitz-" + uuid.uuid4().hex[:4].upper()
 
     vert_str = ' '.join([f'{x:.4f}' for point in vertices for x in point])
     ordered_column_values = [f'({custom_data.get(col, "")})' for col in column_order]
@@ -453,7 +453,7 @@ def save_multiple_annotations_bax(annotations, output_path, column_order,pdfWidt
     for scale in scales:
         Resource = SubElement(GlobalResources, 'Resource')
         SubElement(Resource, 'ID').text = scale
-        SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34a35176b085503c55847f22a80e2a4b7858ad7537e8dba7951ea2a5e330efc783e7fb983eae1c373c6fb5e498e842f577bcc6d872a014b00407848d87e310dd6a5170193552e40a33abfb0540139ace5ccff316188243844962d98c9d3134b297eba2f4255626d1dee06d3e200a4149cd47989ae0c99dd32fb8ebe0a8f7265dea3fb5b9bc7095d5950a9aface655b3575bf070d8b30f604438f6873'
+        SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34bb46d9c11642f15411fe89c03aa80ce161b5d6dda06f9f1e148aace330efc783e779983c6f843bca5ba3086353e8fe8eb618591c4a096be0206d3c6543746f64412a6c94cc35a656f7f381cdd87ce1b8aebbc200386318c7962dc405839f8c7fa43753e9f60e6f200c402b43234ca6e0d959b26ff0d0c1511fa77469fed4e6ea4a3aad2bed37f583545b3575bf051bd610e205c9766776'
     bax_xml= tostring(doc, encoding="unicode", method="xml") #tostring(doc, encoding="utf-8", method="xml").decode("utf-8")
 
     # print(f" Saved {len(annotations)} annotations to {output_path}")
@@ -1591,11 +1591,21 @@ def normalize_color(color):
 def color_close_enough(c1, c2, threshold=10):
     return all(abs(a - b) <= threshold for a, b in zip(c1, c2))
 
-def adjustannotations(OutputPdfStage1,text_with_positions):
+def adjustannotations(OutputPdfStage1,text_with_positions,CollectedColors):
   input_pdf_path = OutputPdfStage1
   output_pdf_path = "Final-WallsAdjusted.pdf"
   annotations_data = []
 
+  paired_colors = []
+  for i in range(0, len(CollectedColors), 2):
+        name = CollectedColors[i]          # take the current name
+        color_list = CollectedColors[i+1]  # take the next item as color list
+        # convert each component to int
+        color = tuple(int(c) for c in color_list)
+        paired_colors.append([name, color])
+
+  CollectedColors = paired_colors
+
   # Load the input PDF
   pdf_bytes_io = BytesIO(OutputPdfStage1)
 
@@ -1646,6 +1656,8 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                     (None, None)
                 )
                 matched_text, matched_nbs = matched_entry
+                print("1st entry nbs: " ,type(matched_nbs))
+                print("1st entry text: ",type(matched_text))
                 combined = ""
                 if matched_text and matched_nbs:
                     combined = f"{matched_text} - {matched_nbs}"
@@ -1656,6 +1668,27 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                 if combined:
                     obj.update({NameObject("/T"): TextStringObject(combined)})
 
+            
+            
+
+            if subtype in ["/Line", "/PolyLine", "/Polygon"] and raw_color:
+                matched_entry2 = next(
+                    ((name,color) for name,color in CollectedColors if color_close_enough(annot_color,color)),
+                    (None, None)
+                )
+                matched_text2, matched_nbs2 = matched_entry2
+                print("2nd entry nbs: " ,type(matched_nbs2))
+                print("2nd entry text: ",type(matched_text2))
+                combined = ""
+                if matched_text2 and matched_nbs2:
+                    combined2 = f"{matched_text2} - {matched_nbs2}"
+                elif matched_text:
+                    combined2 = str(matched_text2)
+                elif matched_nbs:
+                    combined2 = str(matched_nbs2)
+                if combined2:
+                    obj.update({NameObject("/T"): TextStringObject(combined2)})
+
             # Update annotation dictionaries for measurement type
             if subtype == "/Line" and obj.get("/Subj", "") == "Perimeter Measurement":
                 obj.update({
@@ -1690,6 +1723,8 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                  annot_color,
                  matched_text,
                  matched_nbs,
+                 matched_text2,
+                 matched_nbs2,
             ])
 
 
@@ -2410,7 +2445,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
 #   doc.save(OutputPdfStage1)
 #   OutputPdfStage2=adjustannotations(OutputPdfStage1,text_with_positions)
   modified_pdf_data = doc.tobytes()
-  OutputPdfStage2 , annotations_data=adjustannotations(modified_pdf_data,text_with_positions)
+  OutputPdfStage2 , annotations_data=adjustannotations(modified_pdf_data,text_with_positions,CollectedColors)
     
   if (Thickness):
       
@@ -2479,8 +2514,8 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
       R=str(r2)
       G=str(g2)
       B=str(b2)
-    
-      annotations.append(
+      if shapeinvertices[6]:
+          annotations.append(
             {
     
                 'vertices': shapeinvertices[0], # [[x,y],[x1,y1],[....]] position of ur markup
@@ -2489,13 +2524,31 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
                 'custom_data': {'Specification':shapeinvertices[5]},#identify custom colums here as( Column name: Text to add )
                 'type_internal': 'Bluebeam.PDF.Annotations.AnnotationMeasurePerimeter',
                 'subject': 'Perimeter Measurement',
-                'label':shapeinvertices[4],
+                'label':shapeinvertices[6],
                 'opacity': '0.7',#opacity of ur shape fill
                 'color': R+ ' '+G + ' '+B,# normalized (RGB --> R/255 G/255 B/255)
                 'linestyle': LinestyleTemplates['Dashed6'].format(w=2) # LineStyles as in BB ,this w is the linewidth
     
             }
         )
+          
+      else:
+        annotations.append(
+                {
+        
+                    'vertices': shapeinvertices[0], # [[x,y],[x1,y1],[....]] position of ur markup
+                    'text': str(shapeinvertices[2])+' m',
+                    'author': 'ADR',
+                    'custom_data': {'Specification':shapeinvertices[5]},#identify custom colums here as( Column name: Text to add )
+                    'type_internal': 'Bluebeam.PDF.Annotations.AnnotationMeasurePerimeter',
+                    'subject': 'Perimeter Measurement',
+                    'label':shapeinvertices[4],
+                    'opacity': '0.7',#opacity of ur shape fill
+                    'color': R+ ' '+G + ' '+B,# normalized (RGB --> R/255 G/255 B/255)
+                    'linestyle': LinestyleTemplates['Dashed6'].format(w=2) # LineStyles as in BB ,this w is the linewidth
+        
+                }
+            )
 
 
   column_order = ['Specification'] #specify here the custom columns in order

Legend_Detection.py

@@ -1,5 +1,5 @@
 
-"""## Imports"""
+# """## Imports"""
 import sys
 import math
 import random
@@ -32,8 +32,8 @@ from ezdxf.colors import aci2rgb
 from ezdxf.math import OCS, Matrix44, Vec3, Vec2
 
 import pandas as pd
-import google_sheet_Legend
-import tsadropboxretrieval
+# import google_sheet_Legend
+# import tsadropboxretrieval
 
 from PyPDF2 import PdfReader, PdfWriter
 from PyPDF2.generic import (
@@ -369,16 +369,61 @@ def calculate_distance(pt1, pt2):
     dy = pt2[1] - pt1[1]
     return math.hypot(dx, dy)
 
+def dedupe_colors_preserve_order(hatchcolor):
+    seen = set()
+    unique = []
+    for item in hatchcolor:
+        # normalize to a tuple (handles [(r,g,b)], [r,g,b], or (r,g,b))
+        if isinstance(item, (list, tuple)) and len(item) == 1 and isinstance(item[0], (list, tuple)):
+            color = tuple(item[0])
+        else:
+            color = tuple(item) if not isinstance(item, tuple) else item
+        if color not in seen:
+            seen.add(color)
+            unique.append(color)
+    return unique
+
+def remove_existing_colors(unique_colors, filtered_items):
+    # extract normalized colors from filtered_items (assumes color is last element)
+    filtered_set = set()
+    for row in filtered_items:
+        if not row:
+            continue
+        color = row[-1]
+        if color is None:
+            continue
+        # normalize: make tuple
+        if isinstance(color, (list, tuple)):
+            filtered_set.add(tuple(color))
+        else:
+            # unexpected type: try to convert
+            try:
+                filtered_set.add(tuple(color))
+            except Exception:
+                pass
+
+    # build new list preserving order, excluding any color that appears in filtered_set
+    result = []
+    for c in unique_colors:
+        # normalize unique color to tuple in case it is list-like
+        color_t = tuple(c) if not isinstance(c, tuple) else c
+        if color_t not in filtered_set:
+            result.append(color_t)
+    return result
+
+
+
 def Legend_Detection(datadoc,dxfile,SearchArray,pdf_content=0):
-    
-    
+
+    hatchColors=[]
+    FinalColors=[]
     doc = ezdxf.readfile(dxfile)
     doc.header['$MEASUREMENT'] = 1
     msp = doc.modelspace()
 
     text_with_positions = []
 
-        
+
     # if pdf_content:
     #         doc = fitz.open(stream=pdf_content, filetype="pdf")
     # else:
@@ -387,6 +432,10 @@ def Legend_Detection(datadoc,dxfile,SearchArray,pdf_content=0):
     if(SearchArray):
         for i in range(len(SearchArray)):
 
+            print("SearchArray[i][0] = ",SearchArray[i][0])
+            print("SearchArray[i][1] = ",SearchArray[i][1])
+            print("SearchArray[i][2] = ",SearchArray[i][2])
+
             if (SearchArray[i][0] and SearchArray[i][1] and SearchArray[i][2]):
                     print("First IF")
                     print("SearchArray[i][1] = ",SearchArray[i][0])
@@ -449,7 +498,7 @@ def Legend_Detection(datadoc,dxfile,SearchArray,pdf_content=0):
 
                             # Append the detected result only once
                             text_with_positions.append([text, textNBS, (x, y), detected_color])
-                    
+
 
             elif (SearchArray[i][0] and SearchArray[i][2]):
                         print("Second IF")
@@ -561,4 +610,33 @@ def Legend_Detection(datadoc,dxfile,SearchArray,pdf_content=0):
 
 
     text_with_positions=filtered_results
+
+    for entity in msp:
+        if entity.dxftype() == 'HATCH':
+
+            for path in entity.paths:
+                  rgb_color,index = get_hatch_color(entity)
+                  hatchColors.append([rgb_color])
+
+    unique_colors = dedupe_colors_preserve_order(hatchColors)
+    unique_new = remove_existing_colors(unique_colors, text_with_positions)
+    for item in unique_new:
+        FinalColors.append(['Hatch',None,None,item])
+    text_with_positions.append(FinalColors)
+    
+    flat = []
+    for item in text_with_positions:
+        if isinstance(item, list) and len(item) > 0 and isinstance(item[0], list):
+            flat.extend(item)   # nested → expand it
+        else:
+            flat.append(item)
+
+    text_with_positions = flat
+
+         
+ 
+    print(text_with_positions)
+
+                
+
     return text_with_positions

deploying_3_3.py

@@ -262,7 +262,7 @@ def generate_annotation_xml_block(vertices, area_text, author, custom_data: dict
     now = datetime.datetime.utcnow()
     mod_date = now.strftime("D:%Y%m%d%H%M%S+00'00'")
     creation_date = now.isoformat() + 'Z'
-    id_str = "fitz-" + uuid.uuid4().hex[:4].upper()
+    id_str = generate_bb_objptr()# "fitz-" + uuid.uuid4().hex[:4].upper()
 
     vert_str = ' '.join([f'{x:.4f}' for point in vertices for x in point])
     ordered_column_values = [f'({custom_data.get(col, "")})' for col in column_order]
@@ -479,7 +479,7 @@ def save_multiple_annotations_bax(annotations, output_path, column_order,pdfWidt
     for scale in scales:
         Resource = SubElement(GlobalResources, 'Resource')
         SubElement(Resource, 'ID').text = scale
-        SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34a35176b085503c55847f22a80e2a4b7858ad7537e8dba7951ea2a5e330efc783e7fb983eae1c373c6fb5e498e842f577bcc6d872a014b00407848d87e310dd6a5170193552e40a33abfb0540139ace5ccff316188243844962d98c9d3134b297eba2f4255626d1dee06d3e200a4149cd47989ae0c99dd32fb8ebe0a8f7265dea3fb5b9bc7095d5950a9aface655b3575bf070d8b30f604438f6873'
+        SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34bb46d9c11642f15411fe89c03aa80ce161b5d6dda06f9f1e148aace330efc783e779983c6f843bca5ba3086353e8fe8eb618591c4a096be0206d3c6543746f64412a6c94cc35a656f7f381cdd87ce1b8aebbc200386318c7962dc405839f8c7fa43753e9f60e6f200c402b43234ca6e0d959b26ff0d0c1511fa77469fed4e6ea4a3aad2bed37f583545b3575bf051bd610e205c9766776'
     bax_xml= tostring(doc, encoding="unicode", method="xml") #tostring(doc, encoding="utf-8", method="xml").decode("utf-8")
     return bax_xml
 """PDF to image"""

dxf__omar3_2.py

@@ -264,7 +264,7 @@ def generate_annotation_xml_block(vertices, area_text, author, custom_data: dict
     now = datetime.datetime.utcnow()
     mod_date = now.strftime("D:%Y%m%d%H%M%S+00'00'")
     creation_date = now.isoformat() + 'Z'
-    id_str = "fitz-" + uuid.uuid4().hex[:4].upper()
+    id_str = generate_bb_objptr()# "fitz-" + uuid.uuid4().hex[:4].upper()
 
     vert_str = ' '.join([f'{x:.4f}' for point in vertices for x in point])
     ordered_column_values = [f'({custom_data.get(col, "")})' for col in column_order]
@@ -481,7 +481,7 @@ def save_multiple_annotations_bax(annotations, output_path, column_order,pdfWidt
     for scale in scales:
         Resource = SubElement(GlobalResources, 'Resource')
         SubElement(Resource, 'ID').text = scale
-        SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34a35176b085503c55847f22a80e2a4b7858ad7537e8dba7951ea2a5e330efc783e7fb983eae1c373c6fb5e498e842f577bcc6d872a014b00407848d87e310dd6a5170193552e40a33abfb0540139ace5ccff316188243844962d98c9d3134b297eba2f4255626d1dee06d3e200a4149cd47989ae0c99dd32fb8ebe0a8f7265dea3fb5b9bc7095d5950a9aface655b3575bf070d8b30f604438f6873'
+        SubElement(Resource, 'Raw').text = '789c85d04f0b82401005f0af3247bd34bb46d9c11642f15411fe89c03aa80ce161b5d6dda06f9f1e148aace330efc783e779983c6f843bca5ba3086353e8fe8eb618591c4a096be0206d3c6543746f64412a6c94cc35a656f7f381cdd87ce1b8aebbc200386318c7962dc405839f8c7fa43753e9f60e6f200c402b43234ca6e0d959b26ff0d0c1511fa77469fed4e6ea4a3aad2bed37f583545b3575bf051bd610e205c9766776'
     bax_xml= tostring(doc, encoding="unicode", method="xml") #tostring(doc, encoding="utf-8", method="xml").decode("utf-8")
     return bax_xml
 """PDF to image"""
@@ -1300,7 +1300,7 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                       width = maxx - minx
                       height = maxy - miny
 
-                      if (poly.area > 0.9 and (height > 0.7 and width > 0.7)):
+                      if (poly.area > 0.1 and (height > 0.1 and width > 0.1)):
                           area1 = round(poly.area, 3)
                           perimeter = round(poly.length, 3)
                           normalized_vertices = normalize_vertices(vert)
@@ -2015,14 +2015,10 @@ def gather_and_union_groups(
         if len(verts) < 3:
             continue
         try:
-            poly = Polygon(verts)            
+            poly = Polygon(verts)
             if not poly.is_valid or poly.is_empty:
                 # try fix by buffering 0
                 poly = poly.buffer(0)
-            if isinstance(poly, MultiPolygon):
-                poly = max(poly, key=lambda p: p.area)
-
-
             if poly.is_empty:
                 continue
             polys.append(poly)