Update doors_fasterrcnn.py

doors_fasterrcnn.py

@@ -104,7 +104,7 @@ def calculate_midpoint(p1, p2):
 def get_door_info(doors_info):
   width_pixels = []
   lines = []
-  sanda = []
+  #sanda = []
   line_midpoint = []
   singles = 0 
   door_type = []
@@ -113,15 +113,19 @@ def get_door_info(doors_info):
     #horz_bottom
     if door_inf[1] == 2:
       #for drawing
-      point_st = (int(xmin), int(ymax) + 5)
-      point_end = (int(xmax),int(ymax) + 5)
+      #point_st = (int(xmin), int(ymax) + 5)
+      #point_end = (int(xmax),int(ymax) + 5)
+        
+      point_st = (int(xmin), int(ymax))
+      point_end = (int(xmax),int(ymax))
       lines.append((point_st,point_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+        
+      #sanda_st = (int(xmin), int(ymax))
+      #sand_end = (int(xmax),int(ymax))
+      #sanda.append((sanda_st, sand_end))
 
-      sanda_st = (int(xmin), int(ymax))
-      sand_end = (int(xmax),int(ymax))
-      sanda.append((sanda_st, sand_end))
-
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmin,ymax), (xmax,ymax))
       width_pixels.append(width)
@@ -131,14 +135,18 @@ def get_door_info(doors_info):
     #horz_upper
     if door_inf[1] == 3:
       #for drawing
-      point_st = (int(xmin),int(ymin) -5)
-      point_end = (int(xmax),int(ymin) - 5)
+      point_st = (int(xmin),int(ymin))
+      point_end = (int(xmax),int(ymin))
+        
+      #point_st = (int(xmin),int(ymin) -5)
+      #point_end = (int(xmax),int(ymin) - 5)
       lines.append((point_st,point_end))
-
-      sanda_st = (int(xmin),int(ymin))
-      sand_end = (int(xmax),int(ymin))
-      sanda.append((sanda_st, sand_end))
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      line_midpoint.append(calculate_midpoint(point_st, point_end))
+        
+      #sanda_st = (int(xmin),int(ymin))
+      #sand_end = (int(xmax),int(ymin))
+      #sanda.append((sanda_st, sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmin,ymin), (xmax,ymin))
       width_pixels.append(width)
@@ -148,14 +156,18 @@ def get_door_info(doors_info):
     #vert_right
     if door_inf[1] == 4:
       #for drawing
-      point_st = (int(xmax) + 5,int(ymin))
-      point_end = (int(xmax) + 5,int(ymax))
-      lines.append((point_st,point_end))
+      #point_st = (int(xmax) + 5,int(ymin))
+      #point_end = (int(xmax) + 5,int(ymax))
 
-      sanda_st = (int(xmax), int(ymin))
-      sand_end = (int(xmax), int(ymax))
-      sanda.append((sanda_st, sand_end))
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      point_st = (int(xmax), int(ymin))
+      point_end = (int(xmax), int(ymax))  
+      lines.append((point_st,point_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+      
+        #sanda_st = (int(xmax), int(ymin))
+      #sand_end = (int(xmax), int(ymax))
+      #sanda.append((sanda_st, sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmax,ymin), (xmax,ymax))
       width_pixels.append(width)
@@ -164,38 +176,45 @@ def get_door_info(doors_info):
     #vert_left
     if door_inf[1] == 5:
       #for drawing
-      point_st = (int(xmin) -5,int(ymin))
-      point_end = (int(xmin) -5,int(ymax))
+      point_st = (int(xmin),int(ymin))
+      point_end = (int(xmin),int(ymax))
+        
+      #point_st = (int(xmin) -5,int(ymin))
+      #point_end = (int(xmin) -5,int(ymax))
       lines.append((point_st,point_end))
-
-      sanda_st = (int(xmin),int(ymin))
-      sand_end = (int(xmin),int(ymax))
-      sanda.append((sanda_st, sand_end))
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+        
+      #sanda_st = (int(xmin),int(ymin))
+      #sand_end = (int(xmin),int(ymax))
+      #sanda.append((sanda_st, sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmin,ymin), (xmin,ymax))
       width_pixels.append(width)
       singles +=1
       door_type.append(0)
 
-  return width_pixels, lines, sanda, line_midpoint, singles, door_type
+  return width_pixels, lines, line_midpoint, singles, door_type
 
-def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_midpoint, door_type):
+def get_door_info_double(doors_info_double, width_pixels, lines, line_midpoint, door_type):
   doubles = 0  
   for door_inf in doors_info_double:
     xmin, ymin, xmax, ymax = door_inf[0]
       
     #double_bottom
     if door_inf[1] == 1:
-      point_st = (int(xmin), int(ymax) + 5)
-      point_end = (int(xmax),int(ymax) + 5)
+      point_st = (int(xmin), int(ymax))
+      point_end = (int(xmax),int(ymax))
+        
+      #point_st = (int(xmin), int(ymax) + 5)
+      #point_end = (int(xmax),int(ymax) + 5)
       lines.append((point_st,point_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+      #sanda_st = (int(xmin), int(ymax))
+      #sand_end = (int(xmax),int(ymax))
+      #sanda.append((sanda_st, sand_end))
 
-      sanda_st = (int(xmin), int(ymax))
-      sand_end = (int(xmax),int(ymax))
-      sanda.append((sanda_st, sand_end))
-
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmin,ymax), (xmax,ymax))
       width_pixels.append(width)
@@ -206,14 +225,18 @@ def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_mid
     #double_upper
     if door_inf[1] == 7:
       #for drawing
-      point_st = (int(xmin),int(ymin) -5)
-      point_end = (int(xmax),int(ymin) - 5)
+      point_st = (int(xmin),int(ymin))
+      point_end = (int(xmax),int(ymin))
+        
+      #point_st = (int(xmin),int(ymin) -5)
+      #point_end = (int(xmax),int(ymin) - 5)
       lines.append((point_st,point_end))
-
-      sanda_st = (int(xmin),int(ymin))
-      sand_end = (int(xmax),int(ymin))
-      sanda.append((sanda_st, sand_end))
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+        
+      #sanda_st = (int(xmin),int(ymin))
+      #sand_end = (int(xmax),int(ymin))
+      #sanda.append((sanda_st, sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmin,ymin), (xmax,ymin))
       width_pixels.append(width)
@@ -223,14 +246,17 @@ def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_mid
     #double_right
     if door_inf[1] == 8:
       #for drawing
-      point_st = (int(xmax) + 5,int(ymin))
-      point_end = (int(xmax) + 5,int(ymax))
+      #point_st = (int(xmax) + 5,int(ymin))
+      #point_end = (int(xmax) + 5,int(ymax))
+        
+      point_st = (int(xmax),int(ymin))
+      point_end = (int(xmax),int(ymax))
       lines.append((point_st,point_end))
-
-      sanda_st = (int(xmax), int(ymin))
-      sand_end = (int(xmax), int(ymax))
-      sanda.append((sanda_st, sand_end))
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+      #sanda_st = (int(xmax), int(ymin))
+      #sand_end = (int(xmax), int(ymax))
+      #sanda.append((sanda_st, sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmax,ymin), (xmax,ymax))
       width_pixels.append(width)
@@ -240,21 +266,25 @@ def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_mid
     #double_left
     if door_inf[1] == 4:
       #for drawing
-      point_st = (int(xmin) -5,int(ymin))
-      point_end = (int(xmin) -5,int(ymax))
-      lines.append((point_st,point_end))
+      #point_st = (int(xmin) -5,int(ymin))
+      #point_end = (int(xmin) -5,int(ymax))
 
-      sanda_st = (int(xmin),int(ymin))
-      sand_end = (int(xmin),int(ymax))
-      sanda.append((sanda_st, sand_end))
-      line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
+      point_st = (int(xmin),int(ymin))
+      point_end = (int(xmin),int(ymax))
+      lines.append((point_st,point_end))
+      line_midpoint.append(calculate_midpoint(point_st,point_end))
+        
+      #sanda_st = (int(xmin),int(ymin))
+      #sand_end = (int(xmin),int(ymax))
+      #sanda.append((sanda_st, sand_end))
+      #line_midpoint.append(calculate_midpoint(sanda_st,sand_end))
       #for calculation
       width = distance((xmin,ymin), (xmin,ymax))
       width_pixels.append(width)
       doubles +=1
       door_type.append(1)
 
-  return width_pixels, lines, sanda, line_midpoint, doubles, door_type
+  return width_pixels, lines, line_midpoint, doubles, door_type
 
 def pxl2meter(width_pixels, ratio):
   real_width = []
@@ -323,7 +353,7 @@ def adjustannotations(OutputPdfStage1):
   print("Annotations updated and saved ")
   return output_pdf_io.read()
 
-def add_annotations_to_pdf(image, pdf_name, lines, sanda, char_width, line_midpoint, door_type):
+def add_annotations_to_pdf(image, pdf_name, lines, char_width, line_midpoint, door_type):
     image_width, image_height = image.size
 
     # Create a new PDF document
@@ -366,7 +396,8 @@ def add_annotations_to_pdf(image, pdf_name, lines, sanda, char_width, line_midpo
         
     #Annotation for drawin lines as in the markups
     for i in range(len(lines)):
-        l_points = [fitz.Point(*sanda[i][0])* derotationMatrix, fitz.Point(*lines[i][0])* derotationMatrix, fitz.Point(*lines[i][1])* derotationMatrix, fitz.Point(*sanda[i][1])* derotationMatrix]
+        l_points = [fitz.Point(*lines[i][0])* derotationMatrix, fitz.Point(*lines[i][1])* derotationMatrix]
+        #l_points = [fitz.Point(*sanda[i][0])* derotationMatrix, fitz.Point(*lines[i][0])* derotationMatrix, fitz.Point(*lines[i][1])* derotationMatrix, fitz.Point(*sanda[i][1])* derotationMatrix]        
         annot = page.add_polyline_annot(l_points) 
         annot.set_border(width=2, dashes=None)  # Optional border styling
         annot.set_colors(stroke=(1, 0, 0))  # Set the line color to red
@@ -431,9 +462,9 @@ def main_run(img_pillow,pdf_fullpath, weights_path, weights_path2, pdf_name,pdfp
     doors_info_double = ev_model(img_pillow, model2, device2, 0.8)
 
     
-    width_pixels, lines, sanda, line_midpoint, single_count, door_type = get_door_info(doors_info)
+    width_pixels, lines, line_midpoint, single_count, door_type = get_door_info(doors_info)
     
-    width_pixels, lines, sanda, line_midpoint, double_count, door_type = get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_midpoint, door_type)
+    width_pixels, lines, line_midpoint, double_count, door_type = get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_midpoint, door_type)
 
     real_width = pxl2meter(width_pixels, ratio)
     char_width = width_as_char(real_width)