Update app.py

app.py

@@ -82,36 +82,16 @@ def display_detectionsandcountings_detclasim(img_array, detections, c_cnames, c_
     text += f'total = {total}'+'\n'
     return img, text
 
-def display_detectionsandcountings_yolocounter(img_array, detections, countings, coverage, prob_th=0, cth = 0):
-    img = Image.fromarray(img_array)
-    img1 = ImageDraw.Draw(img)
-    h, w = img.size
-    ratio = h/4000
-
-    for (box, _, y_prob, y_class) in detections:
-        y_prob = float(y_prob)
-        if y_prob > prob_th:
-            img1.rectangle(box, outline='red', width=int(20*ratio))
-            img1.text(box[:2], y_class+str(round(y_prob,3)), fill='white')
-
+def displaytext_yolocounter(countings, coverage):
     countings_list = list(countings.items())
     countings_list.sort(key = lambda x: x[1], reverse=True)
-    yi=int(20*ratio)
-    total = 0
-    for (y_class,c) in countings_list:
-        if c > cth:
-            img1.text((int(50*ratio), yi), "# {} = {}".format(y_class, c), fill='red')
-            yi += int(100*ratio)
-            total += c
-    yi += int(100*ratio)
-    img1.text((int(50*ratio), yi), "# {} = {}".format('total', total), fill='red')
 
     text = f'coverage = {coverage}'+'\n\n'
     for key,value in countings_list:
         text += f'{key} = {value}'+'\n'
     text += '\n'
     text += f'total = {total}'+'\n'
-    return img, text
+    return text
 
 def display_detectionsandcountings_directcounter(img_array, countings, prob_th=0, cth = 0):
     img = Image.fromarray(img_array)
@@ -158,7 +138,7 @@ def testing_yolocounter(input_img):
     detections = response['detections']
     img_out = response['img_out']
     img = Image.open(BytesIO(base64.b64decode(img_out)))
-    _, text = display_detectionsandcountings_yolocounter(input_img, detections, countings, coverage, prob_th=0, cth = 0)
+    text = displaytext_yolocounter(countings, coverage)
     return img, text
 
 def testing_directcounter(input_img):