Upload 4 files

Code_2_7.py

@@ -1244,9 +1244,15 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray,Coll
                                     # colored_fix = [tuple(map(int, c)) for c in coloredarray]
 
                                     if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+
+                                        print("rgbcolor in 2.7 hatch 1 type = ",type(rgb_color))
+                                        print("coloredarray in 2.7 hatch 1 type = ",type(coloredarray))
+
                                         hatched_areas.append([vertices, area1, length, rgb_color])
                                     elif (len(coloredarray) == 0):
                                         hatched_areas.append([vertices, area1, length, rgb_color])
+                                    print("rgbcolor = ",rgb_color)
+                                    print("coloredarray =",coloredarray)
 
 
                 elif str(path.type) == 'BoundaryPathType.EDGE' or path.type == 2:
@@ -1300,6 +1306,10 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray,Coll
 
                                 rgbconverted = tuple(rgb_color)
                                 if ( len(CollectedColors) > 0 and (rgb_color in CollectedColors)):
+
+                                    print("rgbcolor in 2.7 hatch 2 type = ",type(rgb_color))
+                                    print("CollectedColors in 2.7 hatch 2 type = ",type(CollectedColors))
+
                                     hatched_areas.append([vert, area1, length, rgb_color])
                                 elif  (len(CollectedColors) == 0):    
                                     hatched_areas.append([vert, area1, length, rgb_color])
@@ -1334,6 +1344,8 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray,Coll
                   unique_shapes.append((normalized_vertices, area1))
                   rgbconverted = tuple(rgb_color)
                   if ( len(CollectedColors) > 0 and (rgb_color in CollectedColors)):
+                        print("rgbcolor in 2.7 solid type = ",type(rgb_color))
+                        print("CollectedColors in 2.7 solid type = ",type(CollectedColors))
                         hatched_areas.append([vertices, area1, perimeter, rgb_color])
                   elif (len(CollectedColors) == 0):
                         hatched_areas.append([vertices, area1, perimeter, rgb_color])
@@ -1679,7 +1691,7 @@ def adjustannotations(OutputPdfStage1,text_with_positions,CollectedColors):
                 matched_text2, matched_nbs2 = matched_entry2
                 print("2nd entry nbs: " ,type(matched_nbs2))
                 print("2nd entry text: ",type(matched_text2))
-                combined = ""
+                combined2 = ""
                 if matched_text2 and matched_nbs2:
                     combined2 = f"{matched_text2} - {matched_nbs2}"
                 elif matched_text:
@@ -1978,7 +1990,7 @@ def draw_bb_onPDF(doc,bbox):
 
 def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,Thickness,pdfpath=0,pdfname=0,pdf_content=0):
   print("points_Of_drawing_Canvas in 2.7 = ",points_Of_drawing_Canvas)
-  print("CollectedColors = ",CollectedColors)
+  print("CollectedColors in 2.7 = ",CollectedColors)
   OutputPdfStage1='BB Trial.pdf'
   if pdf_content:
     FinalRatio,width_dxf= RetriveRatio(datadoc,dxfpath,pdf_content)

app.py

@@ -1002,28 +1002,30 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0,csvfile=0):
                     temp_file.write(dxfpath)
                     temp_filename = temp_file.name
                     print(temp_filename)
-                    CorrectionRatio=result[8]
+                    CorrectionRatio=result[9]
                     print("result = ",result)
                     SearchArray=result[6]
                     parsed_url = urlparse(result[0])
+                    CollectedColors=result[7]
+                    print("CollectedColors = ",CollectedColors)
                     filename = parsed_url.path.split('/')[-1]
                     print(filename)
                     nameofpdf=filename
                     points_Of_drawing_Canvas=False
                     
-                    if len(result[7])>0:
-                        points_Of_drawing_Canvas=drawonpdf(nameofpdf,result[7]) ########################## points of manual drawing hereee
+                    if len(result[8])>0:
+                        points_Of_drawing_Canvas=drawonpdf(nameofpdf,result[8]) ########################## points of manual drawing hereee
                     
                     if pdf_content:
                         if section.startswith('3.3'):
-                            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio,points_Of_drawing_Canvas,pdfpath,result[0],pdf_content)
+                            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,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,CorrectionRatio,points_Of_drawing_Canvas,pdfpath,result[0],pdf_content)
+                            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,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,pdfpath,result[0],pdf_content)
                     else:
                         if section.startswith('3.3'):
-                            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio,points_Of_drawing_Canvas,pdfpath,result[0])
+                            doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas , bax_pretty_xml, column_xml=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] ,SearchArray,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,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,CorrectionRatio,points_Of_drawing_Canvas,pdfpath,result[0])
+                            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,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,pdfpath,result[0])
                     global colorsused
                     colorsused=list(SimilarAreaDictionary['Color'])
                     dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'

deploying_3_3.py

@@ -963,7 +963,9 @@ def color_close_enough(c1, c2, threshold=10):
     
     
 """### Hatched areas"""
-def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
+def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray,CollectedColors):
+
+      coloredarray = [tuple(x) for x in CollectedColors]
 
       doc = ezdxf.readfile(filename)
       doc.header['$MEASUREMENT'] = 1
@@ -1241,7 +1243,12 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                             if not duplicate_found:
                                 # rgb_color = get_hatch_color(entity)  # Assuming this function exists
                                 unique_shapes.append((normalized_vertices, area1))
-                                hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                                if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                                elif ( len(coloredarray) == 0 ):
+                                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+
 
                 elif path.type == 2:
                   # convert any spline edges to line edges (approximates splines)
@@ -1312,7 +1319,11 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
 
                           if not duplicate_found:
                               unique_shapes.append((normalized_vertices, area1))
-                              hatched_areas.append([vert, area1, perimeter, rgb_color])
+                              if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                                    hatched_areas.append([vert, area1, perimeter, rgb_color])
+                              elif ( len(coloredarray) == 0):
+                                  hatched_areas.append([vert, area1, perimeter, rgb_color])
+
 
         elif entity.dxftype() == 'SOLID':
             vertices = [entity.dxf.vtx0 * (FinalRatio), entity.dxf.vtx1* (FinalRatio), entity.dxf.vtx2* (FinalRatio), entity.dxf.vtx3* (FinalRatio)]
@@ -1337,7 +1348,11 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
               if not duplicate_found:
                   rgb_color = get_hatch_color(entity)  # Assuming this function exists
                   unique_shapes.append((normalized_vertices, area1))
-                  hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                  if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                  elif( len(coloredarray) == 0):
+                      hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
 
 
 
@@ -1379,7 +1394,11 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                       if not duplicate_found:
                           rgb_color = get_hatch_color(entity)  # Assuming this function exists
                           unique_shapes.append((normalized_vertices, area1))
-                          hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                          if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                            hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                          elif ( len(coloredarray) == 0 ):
+                              hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
 
 
 
@@ -1416,7 +1435,12 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                 if not duplicate_found:
                     rgb_color = get_hatch_color(entity)  # Assuming this function exists
                     unique_shapes.append((normalized_vertices, area1))
-                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                    if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                        hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                    elif ( len(coloredarray) == 0 ):
+                        hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+
 
 
         elif entity.dxftype() == 'SPLINE':
@@ -1449,7 +1473,12 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                 if not duplicate_found:
                     rgb_color = get_hatch_color(entity)  # Assuming this function exists
                     unique_shapes.append((normalized_vertices, area1))
-                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                    if ( len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                        hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                    elif ( len(coloredarray) == 0):
+                        hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+
 
       sorted_data = sorted(hatched_areas, key=lambda x: x[1])
       return sorted_data,Legendarray
@@ -1570,10 +1599,21 @@ def extract_measurement(obj):
     m = re.search(r"([0-9]*\.?[0-9]+)", text)
     return float(m.group(1)) if m else None
 
-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
+
   Trim=0
 
   # Load the input PDF
@@ -1636,6 +1676,24 @@ 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))
+                combined2 = ""
+                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 == "/PolyLine" and obj.get("/Subj", "") == "Perimeter Measurement":
                 
@@ -1674,15 +1732,26 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                 })
 
             # Append metadata
-            annotations_data.append([
+            if matched_text2 or matched_nbs2:
+                annotations_data.append([
                  vertices,
                  area,
                  perimeter,
                  annot_color,
-                 matched_text,
+                 matched_text2,
                  matched_nbs,
                  Trim,
-            ])
+                ])
+            else:
+                annotations_data.append([
+                    vertices,
+                    area,
+                    perimeter,
+                    annot_color,
+                    matched_text,
+                    matched_nbs,
+                    Trim,
+                ])
 
 
 
@@ -2199,7 +2268,7 @@ def draw_bb_onPDF(doc,bbox):
     doc.save('kk.pdf') #ffor visualization only
     return pdf_bbox
    
-def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio,points_Of_drawing_Canvas,pdfpath=0,pdfname=0,pdf_content=0):
+def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,pdfpath=0,pdfname=0,pdf_content=0):
   OutputPdfStage1='BB Trial.pdf'
   if pdf_content:
      FinalRatio,width_dxf= RetriveRatio(datadoc,dxfpath,pdf_content)
@@ -2265,7 +2334,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
     rotationangle = 270
 
 
-  hatched_areas,Legendarray = get_hatched_areas(datadoc,dxfpath,FinalRatio,rotationangle,SearchArray)
+  hatched_areas,Legendarray = get_hatched_areas(datadoc,dxfpath,FinalRatio,rotationangle,SearchArray,CollectedColors)
     
   nearby,grouped_shapes_final=find_nearby_vertices(hatched_areas)
   processed_intersections = process_polygons(nearby, img, dxfratio, rotationangle, derotationMatrix,rotationOld,width,height)
@@ -2545,7 +2614,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
   # doc.save(OutputPdfStage1)
   modified_pdf_data = doc.tobytes()
   # OutputPdfStage2=adjustannotations(modified_pdf_data)
-  OutputPdfStage2,annotations_data=adjustannotations(modified_pdf_data,Legendarray)
+  OutputPdfStage2,annotations_data=adjustannotations(modified_pdf_data,Legendarray,CollectedColors)
     
   allvertices = annotations_data
   hatchcolorR= '0'

dxf__omar3_2.py

@@ -909,54 +909,94 @@ def int_to_rgb(color_int):
 
 
 
+# def get_hatch_color(entity):
+#     # Check if the entity has a "true color" set
+#     if entity.dxf.hasattr('true_color'):
+#       true_color = entity.dxf.true_color
+#       rgb_color = int_to_rgb(true_color)  # Convert integer to (R, G, B)
+#       print(f"True color detected (RGB): {rgb_color}")
+#       return rgb_color
+
+#     color_index = entity.dxf.color
+#     print("color_index = ", color_index)
+
+#     # Check if the color is set to ByLayer or ByBlock
+#     if color_index == 0:  # ByLayer color
+#         print("Color is ByLayer, checking layer color...")
+#         layer_name = entity.dxf.layer
+#         layer = entity.doc.layers.get(layer_name)
+
+#         if layer:  # Ensure layer exists
+#             layer_color_index = layer.dxf.color
+#             print(f"Layer '{layer_name}' Color Index = {layer_color_index}")
+#             return aci_to_rgb(layer_color_index)  # Use custom aci_to_rgb function
+#         else:
+#             print(f"Layer '{layer_name}' not found, defaulting to white.")
+#             return (255, 255, 255)  # Default to white if layer not found
+
+#     elif color_index == 256:  # ByBlock color
+#         print("Color is ByBlock, checking block color or defaulting to white.")
+#         block_color = (255, 255, 255)  # White as default
+
+#         # Check if the entity is inside a block reference and inherit its color
+#         if hasattr(entity, 'block'):  # Check if the entity belongs to a block
+#             block_ref = entity.block
+#             if block_ref.dxf.hasattr('color'):
+#                 block_color = aci_to_rgb(block_ref.dxf.color)
+#                 print(f"Block reference color found: {block_color}")
+#             else:
+#                 print("Block has no color attribute, using default (white).")
+#         return block_color
+
+#     # Otherwise, convert the ACI color to RGB
+#     print(f"Entity Color Index = {color_index}")
+#     if 1 <= color_index <= 255:
+#         rgb_color = aci_to_rgb(color_index)  # Use custom aci_to_rgb function
+#         print(f"Converted RGB = {rgb_color}")
+#         return rgb_color
+
+#     # Default to white if color index is out of bounds or invalid
+#     print("Invalid or unhandled color index, defaulting to white.")
+#     return (255, 255, 255)
+
 def get_hatch_color(entity):
-    # Check if the entity has a "true color" set
+    """Extract hatch color with detailed debugging."""
+    if not entity:
+        # print("No entity provided for color extraction.")
+        return (255, 255, 255)
+
+    # Check for true color
     if entity.dxf.hasattr('true_color'):
-      true_color = entity.dxf.true_color
-      rgb_color = int_to_rgb(true_color)  # Convert integer to (R, G, B)
-      print(f"True color detected (RGB): {rgb_color}")
-      return rgb_color
+        true_color = entity.dxf.true_color
+        rgb_color = int_to_rgb(true_color)  # Convert integer to (R, G, B)
+        # print(f"True color detected (RGB): {rgb_color}")
+        return rgb_color
 
+    # Check for color index
     color_index = entity.dxf.color
-    print("color_index = ", color_index)
+    # print(f"Entity color index: {color_index}")
+    if 1 <= color_index <= 255:
+        rgb_color = aci_to_rgb(color_index)  # Convert ACI to RGB
+        # print(f"Converted ACI to RGB: {rgb_color}")
+        return rgb_color
 
-    # Check if the color is set to ByLayer or ByBlock
-    if color_index == 0:  # ByLayer color
-        print("Color is ByLayer, checking layer color...")
+    # Handle ByLayer or ByBlock
+    if color_index == 0:  # ByLayer
         layer_name = entity.dxf.layer
         layer = entity.doc.layers.get(layer_name)
-
-        if layer:  # Ensure layer exists
+        # print(f"ByLayer detected for layer '{layer_name}'.")
+        if layer:
             layer_color_index = layer.dxf.color
-            print(f"Layer '{layer_name}' Color Index = {layer_color_index}")
-            return aci_to_rgb(layer_color_index)  # Use custom aci_to_rgb function
+            # print(layer_color_index)
+            rgb_color = aci_to_rgb(layer_color_index)
+            # print(f"Layer '{layer_name}' color index {layer_color_index} converted to RGB: {rgb_color}")
+            return rgb_color
         else:
-            print(f"Layer '{layer_name}' not found, defaulting to white.")
-            return (255, 255, 255)  # Default to white if layer not found
-
-    elif color_index == 256:  # ByBlock color
-        print("Color is ByBlock, checking block color or defaulting to white.")
-        block_color = (255, 255, 255)  # White as default
-
-        # Check if the entity is inside a block reference and inherit its color
-        if hasattr(entity, 'block'):  # Check if the entity belongs to a block
-            block_ref = entity.block
-            if block_ref.dxf.hasattr('color'):
-                block_color = aci_to_rgb(block_ref.dxf.color)
-                print(f"Block reference color found: {block_color}")
-            else:
-                print("Block has no color attribute, using default (white).")
-        return block_color
-
-    # Otherwise, convert the ACI color to RGB
-    print(f"Entity Color Index = {color_index}")
-    if 1 <= color_index <= 255:
-        rgb_color = aci_to_rgb(color_index)  # Use custom aci_to_rgb function
-        print(f"Converted RGB = {rgb_color}")
-        return rgb_color
+            # print(f"Layer '{layer_name}' not found. Defaulting to white.")
+            return (255, 255, 255)
 
-    # Default to white if color index is out of bounds or invalid
-    print("Invalid or unhandled color index, defaulting to white.")
+    # Default
+    # print("Unhandled color case. Defaulting to white.")
     return (255, 255, 255)
 
 def calculate_distance(p1, p2):
@@ -971,7 +1011,10 @@ def color_close_enough(c1, c2, threshold=10):
     
     
 """### Hatched areas"""
-def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
+def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray,CollectedColors):
+      
+      coloredarray = [tuple(x) for x in CollectedColors]
+
 
       doc = ezdxf.readfile(filename)
       doc.header['$MEASUREMENT'] = 1
@@ -1249,7 +1292,19 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                             if not duplicate_found:
                                 # rgb_color = get_hatch_color(entity)  # Assuming this function exists
                                 unique_shapes.append((normalized_vertices, area1))
-                                hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+                                print("rgbcolor in 3.2 hatch 1 type = ",type(rgb_color))
+                                print("coloredarray in 3.2 hatch 1 type = ",type(coloredarray))
+                                print("CollectedColors in 3.2 hatch 1 type = ",type(CollectedColors))
+
+                                if (len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                                    print("inside if 1 hatch type")
+                                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                                elif (len(coloredarray) == 0):
+                                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                                # print('rgb_color',rgb_color)
+                                # print('coloredarray',coloredarray)
+   
 
                 elif path.type == 2:
                     # convert any spline edges to line edges (approximates splines)
@@ -1320,7 +1375,20 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
 
                           if not duplicate_found:
                               unique_shapes.append((normalized_vertices, area1))
-                              hatched_areas.append([vert, area1, perimeter, rgb_color])
+
+                              rgbconverted = tuple(rgb_color)
+                              if ( len(CollectedColors) > 0 and (rgb_color in CollectedColors)):
+                                    hatched_areas.append([vert, area1, perimeter, rgb_color])
+                              elif  (len(CollectedColors) == 0):    
+                                    hatched_areas.append([vert, area1, perimeter, rgb_color])
+
+                              
+                            #   if (len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                            #         hatched_areas.append([vert, area1, perimeter, rgb_color])
+                            #   elif  (len(coloredarray) == 0):
+                            #         hatched_areas.append([vert, area1, perimeter, rgb_color])
+    
+
 
         elif entity.dxftype() == 'SOLID':
             vertices = [entity.dxf.vtx0 * (FinalRatio), entity.dxf.vtx1* (FinalRatio), entity.dxf.vtx2* (FinalRatio), entity.dxf.vtx3* (FinalRatio)]
@@ -1345,7 +1413,16 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
               if not duplicate_found:
                   rgb_color = get_hatch_color(entity)  # Assuming this function exists
                   unique_shapes.append((normalized_vertices, area1))
-                  hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+                  print("rgbcolor in 3.2 solid  type = ",type(rgb_color))
+                  print("coloredarray in 3.2 solid type = ",type(coloredarray))
+                  print("CollectedColors in 3.2 solid type = ",type(CollectedColors))
+                  
+                  if (len(CollectedColors) > 0 and ( rgb_color in CollectedColors)):
+                    print("inside solid if")
+                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                  elif (len(CollectedColors) == 0):
+                      hatched_areas.append([vertices, area1, perimeter, rgb_color])
 
 
 
@@ -1387,7 +1464,12 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                       if not duplicate_found:
                           rgb_color = get_hatch_color(entity)  # Assuming this function exists
                           unique_shapes.append((normalized_vertices, area1))
-                          hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+                          if (len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                            hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                          elif (len(coloredarray) == 0):
+                            hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
 
 
 
@@ -1424,7 +1506,13 @@ def get_hatched_areas(datadoc,filename,FinalRatio,rotationangle,SearchArray):
                 if not duplicate_found:
                     rgb_color = get_hatch_color(entity)  # Assuming this function exists
                     unique_shapes.append((normalized_vertices, area1))
-                    hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                    if (len(coloredarray) > 0 and ( rgb_color in coloredarray)):
+                        hatched_areas.append([vertices, area1, perimeter, rgb_color])
+                    elif (len(coloredarray) == 0 ):
+                        hatched_areas.append([vertices, area1, perimeter, rgb_color])
+
+
+
 
 
         # elif entity.dxftype() == 'SPLINE':
@@ -1556,8 +1644,8 @@ 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 color_close_enough(c1, c2, threshold=10):
+#     return all(abs(a - b) <= threshold for a, b in zip(c1, c2))
 
 
 
@@ -1578,10 +1666,21 @@ def extract_measurement(obj):
     m = re.search(r"([0-9]*\.?[0-9]+)", text)
     return float(m.group(1)) if m else None
 
-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
+
   Trim=0
 
   # Load the input PDF
@@ -1644,6 +1743,26 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                 if combined:
                     obj.update({NameObject("/T"): TextStringObject(combined)})
 
+            matched_text2 = None
+            matched_nbs2 = None
+            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))
+                combined2 = ""
+                if matched_text2 and matched_nbs2:
+                    combined2 = f"{matched_text2} - {matched_nbs2}"
+                elif matched_text2:
+                    combined2 = str(matched_text2)
+                elif matched_nbs2:
+                    combined2 = str(matched_nbs2)
+                if combined2:
+                    obj.update({NameObject("/T"): TextStringObject(combined2)})        
+
             # Update annotation dictionaries for measurement type
             if subtype == "/PolyLine" and obj.get("/Subj", "") == "Perimeter Measurement":
                 
@@ -1682,16 +1801,27 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                 })
 
             # Append metadata
-            annotations_data.append([
-                 vertices,
-                 area,
-                 perimeter,
-                 annot_color,
-                 matched_text,
-                 matched_nbs,
-                 Trim,
-            ])
-
+            if matched_text2 or matched_nbs2:
+                annotations_data.append([
+                    vertices,
+                    area,
+                    perimeter,
+                    annot_color,
+                    matched_text2,
+                    matched_nbs,
+                    Trim,
+                ])
+            elif  matched_text or matched_nbs:
+                annotations_data.append([
+                    vertices,
+                    area,
+                    perimeter,
+                    annot_color,
+                    matched_text,
+                    matched_nbs,
+                    Trim,
+                ])
+            print('annot_color',annot_color)
 
 
   output_pdf_io = BytesIO()
@@ -2273,7 +2403,9 @@ def remove_intersecting_vertices(
     return pts, removed, segments
 
 
-def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio,points_Of_drawing_Canvas,pdfpath=0,pdfname=0,pdf_content=0):
+def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio,CollectedColors,points_Of_drawing_Canvas,pdfpath=0,pdfname=0,pdf_content=0):
+  print("CollectedColors in 3.2 File = ",CollectedColors)
+
   OutputPdfStage1='BB Trial.pdf'
   if pdf_content:
      FinalRatio,width_dxf= RetriveRatio(datadoc,dxfpath,pdf_content)
@@ -2338,7 +2470,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
     rotationangle = 270
 
 
-  hatched_areas,Legendarray = get_hatched_areas(datadoc,dxfpath,FinalRatio,rotationangle,SearchArray)
+  hatched_areas,Legendarray = get_hatched_areas(datadoc,dxfpath,FinalRatio,rotationangle,SearchArray,CollectedColors)
     
   nearby,grouped_shapes_final=find_nearby_vertices(hatched_areas)
   processed_intersections = process_polygons(nearby, img, dxfratio, rotationangle, derotationMatrix,rotationOld,width,height)
@@ -2728,7 +2860,7 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,CorrectionRatio
   # doc.save(OutputPdfStage1)
   modified_pdf_data = doc.tobytes()
   # OutputPdfStage2=adjustannotations(modified_pdf_data)
-  OutputPdfStage2,annotations_data=adjustannotations(modified_pdf_data,Legendarray)
+  OutputPdfStage2,annotations_data=adjustannotations(modified_pdf_data,Legendarray,CollectedColors)
     
   allvertices = annotations_data
   hatchcolorR= '0'