Added multiple boxes highlighting in query image

Angelogeb · beabevi · Angelogeb · commit 767f45f3c1f6 · 2018-12-30T17:45:11.000+01:00
Co-authored-by: beabevi &lt;29659657+beabevi@users.noreply.github.com&gt;
diff --git a/create_retrieval_db.py b/create_retrieval_db.py
@@ -23,7 +23,9 @@ def best_bbox(instance, n=1):
             sorted(enumerate(instance[1]), key=lambda t: t[1][0], reverse=True),
         )
     )
-    if n == 1:
+    if not n:
+        return result
+    elif n == 1:
         return result[0]
     return result[:n]
 
diff --git a/dist/index.html b/dist/index.html
@@ -1,34 +1,4 @@
 <html>
-
-<head>
-    <style>
-        .grid {
-                -webkit-columns: 4;
-                columns: 4;
-                -webkit-column-gap: 1em;
-                column-gap: 1em;
-            }
-            .grid__item {
-                margin-bottom: 1em;
-            }
-            .grid__item img {
-                width: 100%;
-            }
-
-            .dropzone {
-                background: white;
-                border-radius: 5px;
-                border: 2px dashed rgb(0, 135, 247);
-                border-image: none;
-                max-width: 500px;
-                margin-left: auto;
-                margin-right: auto;
-                height: 30%;
-            }
-
-        </style>
-</head>
-
 <body>
     <form action="/search" method="POST" enctype="multipart/form-data">
         <input type=file name=file></input>
diff --git a/query.py b/query.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import pickle
 
 import numpy as np
diff --git a/server.py b/server.py
@@ -39,23 +39,25 @@ def search():
     )
 
     instance = result[str(up_name)]
-    best_i = best_bbox(instance)
-    claz = instance[1][best_i][1]
-
-    (x1, y1, x2, y2) = instance[0][best_i]
-
+    best_is = best_bbox(instance, n=None)
     img = cv2.imread(str(up_name))
-    cv2.rectangle(
-        img,
-        (x1, y1),
-        (x2, y2),
-        (
-            int(class_to_color[claz][0]),
-            int(class_to_color[claz][1]),
-            int(class_to_color[claz][2]),
-        ),
-        4,
-    )
+
+    for best_i in best_is:
+        claz = instance[1][best_i][1]
+
+        (x1, y1, x2, y2) = instance[0][best_i]
+
+        cv2.rectangle(
+            img,
+            (x1, y1),
+            (x2, y2),
+            (
+                int(class_to_color[claz][0]),
+                int(class_to_color[claz][1]),
+                int(class_to_color[claz][2]),
+            ),
+            4,
+        )
     cv2.imwrite(str(up_name), img)
     return render_template(
         "result.html", qimg=str(up_name.relative_to("dist")), imgs=sim_images

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@ def best_bbox(instance, n=1):`
`23`	`23`	`sorted(enumerate(instance[1]), key=lambda t: t[1][0], reverse=True),`
`24`	`24`	`)`
`25`	`25`	`)`
`26`		`- if n == 1:`
	`26`	`+ if not n:`
	`27`	`+ return result`
	`28`	`+ elif n == 1:`
`27`	`29`	`return result[0]`
`28`	`30`	`return result[:n]`
`29`	`31`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#!/usr/bin/env python3`
`2`		`-`
`3`	`1`	`import pickle`
`4`	`2`
`5`	`3`	`import numpy as np`