Update Code_2_7.py

Code_2_7.py

@@ -1187,7 +1187,8 @@ def normalize_color(color):
     return tuple(min(max(round(c * 255), 0), 255) for c in 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):
   input_pdf_path = OutputPdfStage1
@@ -1239,7 +1240,7 @@ def adjustannotations(OutputPdfStage1,text_with_positions):
                   # 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 annot_color == color),
+                      ((text, NBS) for text,NBS, _, color in text_with_positions if color_close_enough(annot_color, color)),
                       (None, None)
                   )
                   # print("matched_entry = ",matched_entry)
@@ -1300,30 +1301,53 @@ def remove_duplicate_annotations(pdf_path, threshold):
             to_delete = set()
 
             # Extract annotation positions and colors
-            for annot_index, annot_ref in enumerate(annotations):
-                annot = annot_ref.get_object()
+            # for annot_index, annot_ref in enumerate(annotations):
+            #     annot = annot_ref.get_object()
 
-                if "/Rect" in annot and "/C" in annot:
-                    rect = annot["/Rect"]
-                    if isinstance(rect, ArrayObject):  # Ensure rect is a list
-                        rect = list(rect)
+            #     if "/Rect" in annot and "/C" in annot:
+            #         rect = annot["/Rect"]
+            #         if isinstance(rect, ArrayObject):  # Ensure rect is a list
+            #             rect = list(rect)
 
-                    color = normalize_color(annot["/C"])
-                    annots_data.append((annot_index, rect, color))
+            #         color = normalize_color(annot["/C"])
+            #         annots_data.append((annot_index, rect, color))
+
+            for i, annot_ref in enumerate(annotations):
+                annot = annot_ref.get_object()
+                rect = annot.get("/Rect")
+                color = annot.get("/C")
+
+                if rect and color and isinstance(rect, ArrayObject) and len(rect) == 4:
+                    norm_color = normalize_color(color)
+                    annots_data.append((i, list(rect), norm_color))
+                    
 
-            # Compare distances and mark duplicates
             for i, (idx1, rect1, color1) in enumerate(annots_data):
                 if idx1 in to_delete:
                     continue
-                for j, (idx2, rect2, color2) in enumerate(annots_data[i+1:], start=i+1):
+                for j in range(i + 1, len(annots_data)):
+                    idx2, rect2, color2 = annots_data[j]
                     if idx2 in to_delete:
                         continue
-                    if color1 == color2 and distance(rect1, rect2) < threshold:
-                        to_delete.add(idx2)  # Mark second annotation for deletion
+                    if color_close_enough(color1, color2) and distance(rect1, rect2) < threshold:
+                        to_delete.add(idx2)
 
-            # Remove duplicates
-            new_annotations = [annotations[i] for i in range(len(annotations)) if i not in to_delete]
-            page[NameObject("/Annots")] = ArrayObject(new_annotations)
+            # Keep only non-duplicates
+            new_annots = [annotations[i] for i in range(len(annotations)) if i not in to_delete]
+            page[NameObject("/Annots")] = ArrayObject(new_annots)
+            # Compare distances and mark duplicates
+            # for i, (idx1, rect1, color1) in enumerate(annots_data):
+            #     if idx1 in to_delete:
+            #         continue
+            #     for j, (idx2, rect2, color2) in enumerate(annots_data[i+1:], start=i+1):
+            #         if idx2 in to_delete:
+            #             continue
+            #         if color1 == color2 and distance(rect1, rect2) < threshold:
+            #             to_delete.add(idx2)  # Mark second annotation for deletion
+
+            # # Remove duplicates
+            # new_annotations = [annotations[i] for i in range(len(annotations)) if i not in to_delete]
+            # page[NameObject("/Annots")] = ArrayObject(new_annotations)
 
         writer.add_page(page)
 
@@ -1603,12 +1627,26 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,Thickness,pdfpa
           # Draw the line annotation for distance1
           chosen_start = start_point1
           chosen_end = end_point1
-          annot12 = page2.add_line_annot(chosen_start, chosen_end)
+          # annot12 = page2.add_line_annot(chosen_start, chosen_end)
+          points=[]
+          points.append(chosen_start)
+          points.append(chosen_end)
+          annot12 = page2.add_polyline_annot(points)
+          
       elif max_distance == distance2:
           # Draw the line annotation for distance2
           chosen_start = start_point2
           chosen_end = end_point2
-          annot12 = page2.add_line_annot(chosen_start, chosen_end)
+          # annot12 = page2.add_line_annot(chosen_start, chosen_end)
+          points=[]
+          points.append(chosen_start)
+          points.append(chosen_end)
+          # annot12 = page2.add_polyline_annot(points)
+          points=[]
+          points.append(chosen_start)
+          points.append(chosen_end)
+          annot12 = page2.add_polyline_annot(points)
+          
       elif max_distance == half1_distance:
           # annot12 = page2.add_polyline_annot(half1)
           max_pair_distance = 0.0
@@ -1633,7 +1671,11 @@ def mainFunctionDrawImgPdf(datadoc,dxfpath, dxfratio,SearchArray,Thickness,pdfpa
           #    the two consecutive points with the greatest separation.
           if max_pair_start is not None and max_pair_end is not None:
               # 6. Draw the line annotation using these two points
-              annot12 = page2.add_line_annot(max_pair_start, max_pair_end)
+              # annot12 = page2.add_line_annot(max_pair_start, max_pair_end)
+              points=[]
+              points.append(max_pair_start)
+              points.append(max_pair_end)
+              annot12 = page2.add_polyline_annot(points)
               # print(f"Drew line annotation between {max_pair_start} and {max_pair_end}")
           else:
               # This case only occurs if half1 has fewer than 2 points