IbrahimHasani commited on
Commit
4f3310e
1 Parent(s): 59ec2c1

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +11 -7
app.py CHANGED
@@ -91,8 +91,11 @@ def detect_and_crop(target_image, query_image, threshold=0.5, nms_threshold=0.3)
91
  return filtered_boxes, target_image
92
 
93
  def image_matching_no_pyramid(query_img, target_img, visualize=True):
94
- image1, inp1, scales1 = read_image(target_img, device, [640*2], 0, True)
95
- image0, inp0, scales0 = read_image(query_img, device, [640*2], 0, True)
 
 
 
96
 
97
  if image0 is None or image1 is None:
98
  return None
@@ -137,15 +140,16 @@ def check_object_in_image(query_image, target_image, threshold=50, scale_factor=
137
  cropped_images, bbox_image = detect_and_crop(target_image, query_image)
138
 
139
  temp_files = [save_array_to_temp_image(i) for i in cropped_images]
140
- crop_results = [image_matching_no_pyramid(query_image, i, visualize=True) for i in temp_files]
141
 
142
  cropped_visuals = []
143
  cropped_inliers = []
144
  for result in crop_results:
145
- for img in result['visualized_image']:
146
- cropped_visuals.append(Image.fromarray(img))
147
- for inliers_ in result['inliers']:
148
- cropped_inliers.append(inliers_)
 
149
 
150
  images_to_return.append(stitch_images(cropped_visuals))
151
 
 
91
  return filtered_boxes, target_image
92
 
93
  def image_matching_no_pyramid(query_img, target_img, visualize=True):
94
+ temp_query = save_array_to_temp_image(np.array(query_img))
95
+ temp_target = save_array_to_temp_image(np.array(target_img))
96
+
97
+ image1, inp1, scales1 = read_image(temp_target, device, [640*2], 0, True)
98
+ image0, inp0, scales0 = read_image(temp_query, device, [640*2], 0, True)
99
 
100
  if image0 is None or image1 is None:
101
  return None
 
140
  cropped_images, bbox_image = detect_and_crop(target_image, query_image)
141
 
142
  temp_files = [save_array_to_temp_image(i) for i in cropped_images]
143
+ crop_results = [image_matching_no_pyramid(query_image, Image.open(i), visualize=True) for i in temp_files]
144
 
145
  cropped_visuals = []
146
  cropped_inliers = []
147
  for result in crop_results:
148
+ if result:
149
+ for img in result['visualized_image']:
150
+ cropped_visuals.append(Image.fromarray(img))
151
+ for inliers_ in result['inliers']:
152
+ cropped_inliers.append(inliers_)
153
 
154
  images_to_return.append(stitch_images(cropped_visuals))
155