Update doors_fasterrcnn.py

doors_fasterrcnn.py

@@ -100,21 +100,18 @@ def calculate_midpoint(p1, p2):
     xm = int((x1 + x2) / 2)
     ym = int((y1 + y2) / 2)
     return (xm, ym)
-def get_door_info(doors_info, doors_info_double):
+    
+def get_door_info(doors_info):
   width_pixels = []
   lines = []
   sanda = []
   line_midpoint = []
-  #doubleD_bbox = []
-  #doubleD_width = []
   singles = 0 
-  doubles = 0
   door_type = []
   for door_inf in doors_info:
     xmin, ymin, xmax, ymax = door_inf[0]
-    #horz_bottom #double_bottom
-    if door_inf[1] == 2 or door_inf[1] == 1:
-    #if door_inf[1] == 2:
+    #horz_bottom
+    if door_inf[1] == 2:
       #for drawing
       point_st = (int(xmin), int(ymax) + 5)
       point_end = (int(xmax),int(ymax) + 5)
@@ -128,16 +125,9 @@ def get_door_info(doors_info, doors_info_double):
       #for calculation
       width = distance((xmin,ymax), (xmax,ymax))
       width_pixels.append(width)
-      if door_inf[1] == 2:
-          singles +=1
-          door_type.append(0)
-      if door_inf[1] == 1:
-          doubles +=1
-          door_type.append(1)
-      
 
-    #horz_upper #double_upper
-    if door_inf[1] == 3 or door_inf[1] == 7:
+    #horz_upper
+    if door_inf[1] == 3:
       #for drawing
       point_st = (int(xmin),int(ymin) -5)
       point_end = (int(xmax),int(ymin) - 5)
@@ -150,15 +140,9 @@ def get_door_info(doors_info, doors_info_double):
       #for calculation
       width = distance((xmin,ymin), (xmax,ymin))
       width_pixels.append(width)
-      if door_inf[1] == 3:
-          singles +=1
-          door_type.append(0)
-      if door_inf[1] == 7:
-          doubles +=1
-          door_type.append(1)
-
-    #vert_right #double_right
-    if door_inf[1] == 5 or door_inf[1] == 8:
+
+    #vert_right
+    if door_inf[1] == 4:
       #for drawing
       point_st = (int(xmax) + 5,int(ymin))
       point_end = (int(xmax) + 5,int(ymax))
@@ -171,15 +155,8 @@ def get_door_info(doors_info, doors_info_double):
       #for calculation
       width = distance((xmax,ymin), (xmax,ymax))
       width_pixels.append(width)
-      if door_inf[1] == 5:
-          singles +=1
-          door_type.append(0)
-      if door_inf[1] == 8:
-          doubles +=1
-          door_type.append(1)
-          
-    #vert_left #double_left
-    if door_inf[1] == 6 or door_inf[1] == 4:
+    #vert_left
+    if door_inf[1] == 5:
       #for drawing
       point_st = (int(xmin) -5,int(ymin))
       point_end = (int(xmin) -5,int(ymax))
@@ -192,29 +169,11 @@ def get_door_info(doors_info, doors_info_double):
       #for calculation
       width = distance((xmin,ymin), (xmin,ymax))
       width_pixels.append(width)
-      if door_inf[1] ==6:
-          singles +=1
-          door_type.append(0)
-      if door_inf[1] == 4:
-          doubles +=1
-          door_type.append(1)
-          
 
-    #double door  
-    #if door_inf[1] == 1:
-     # doubleD_bbox.append([int(xmin), int(ymin), int(xmax), int(ymax)])
-      #bbox_width = xmax - xmin
-      #bbox_height = ymax - ymin
-      #if bbox_width > bbox_height:
-       # door_width = bbox_width
-        #doubleD_width.append(door_width)
-      #else:
-       # door_width = bbox_height
-        #doubleD_width.append(door_width)
-
-  return width_pixels, lines, sanda, line_midpoint, singles, doubles, door_type
-
-def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_midpoint, doubles, door_type):
+  return width_pixels, lines, sanda, line_midpoint, singles, door_type
+
+def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_midpoint, door_type):
+  doubles = 0  
   for door_inf in doors_info_double:
     xmin, ymin, xmax, ymax = door_inf[0]
       
@@ -287,7 +246,7 @@ def get_door_info_double(doors_info_double, width_pixels, lines, sanda, line_mid
       doubles +=1
       door_type.append(1)
 
-  return width_pixels, lines, sanda, line_midpoint, singles, doubles, door_type
+  return width_pixels, lines, sanda, line_midpoint, doubles, door_type
 
 def pxl2meter(width_pixels, ratio):
   real_width = []
@@ -464,8 +423,10 @@ def main_run(img_pillow,pdf_fullpath, weights_path, weights_path2, pdf_name,pdfp
     doors_info_double = ev_model(img_pillow, model2, device, 0.8)
 
     
-    #width_pixels, lines, sanda, line_midpoint, doubleD_bbox, doubleD_width = get_door_info(doors_info)
-    width_pixels, lines, sanda, line_midpoint, single_count, double_count, door_type = get_door_info(doors_info, doors_info_double)
+    width_pixels, lines, sanda, line_midpoint, single_count, door_type = get_door_info(doors_info)
+    
+    width_pixels, lines, sanda, line_midpoint, double_count, door_type = get_door_info(doors_info_double, width_pixels, lines, sanda, line_midpoint, door_type)
+    
     real_width = pxl2meter(width_pixels, ratio)
     #real_double = pxl2meter(doubleD_width, ratio)
     char_width = width_as_char(real_width)