Update app.py
Browse files
app.py
CHANGED
@@ -19,8 +19,8 @@ name = ['grenade','knife','pistol','rifle']
|
|
19 |
def response(image):
|
20 |
print(image)
|
21 |
results = model(image)
|
22 |
-
text=""
|
23 |
-
|
24 |
|
25 |
for r in results:
|
26 |
conf = np.array(r.boxes.conf)
|
@@ -33,22 +33,22 @@ def response(image):
|
|
33 |
cone = con.astype(float)
|
34 |
conef = round(cone,3)
|
35 |
conef = conef * 100
|
36 |
-
|
37 |
|
38 |
if cl == 0:
|
39 |
-
|
40 |
elif cl == 1:
|
41 |
-
|
42 |
elif cl == 2:
|
43 |
-
|
44 |
elif cl == 3:
|
45 |
-
|
46 |
|
47 |
|
48 |
# im_rgb = Image.fromarray(im_rgb)
|
49 |
|
50 |
|
51 |
-
return
|
52 |
|
53 |
|
54 |
|
|
|
19 |
def response(image):
|
20 |
print(image)
|
21 |
results = model(image)
|
22 |
+
text = ""
|
23 |
+
name_weap = ""
|
24 |
|
25 |
for r in results:
|
26 |
conf = np.array(r.boxes.conf)
|
|
|
33 |
cone = con.astype(float)
|
34 |
conef = round(cone,3)
|
35 |
conef = conef * 100
|
36 |
+
text += (f"Detected {name[cl]} with confidence {round(conef,1)} at ({xy[0]},{xy[1]})%\n")
|
37 |
|
38 |
if cl == 0:
|
39 |
+
name_weap += name[cl] + '\n'
|
40 |
elif cl == 1:
|
41 |
+
name_weap += name[cl] + '\n'
|
42 |
elif cl == 2:
|
43 |
+
name_weap += model2(image) + '\n'
|
44 |
elif cl == 3:
|
45 |
+
name_weap += model2(image) + '\n'
|
46 |
|
47 |
|
48 |
# im_rgb = Image.fromarray(im_rgb)
|
49 |
|
50 |
|
51 |
+
return name_weap, text
|
52 |
|
53 |
|
54 |
|