Update app.py

app.py

@@ -12,15 +12,8 @@ import datetime
 
 def IoU(bbox1, bbox2):
 
-    x1_left = bbox1[0]
-    y1_top = bbox1[1]
-    x1_right = bbox1[2]
-    y1_bot = bbox1[3]
-
-    x2_left = bbox2[0]
-    y2_top = bbox2[1]
-    x2_right = bbox2[2]
-    y2_bot = bbox2[3]
+    x1_left, y1_top, x1_right, y1_bot = bbox1[0], bbox1[1], bbox1[2], bbox1[3]
+    x2_left, y2_top, x2_right, y2_bot = bbox2[0], bbox2[1], bbox2[2], bbox2[3]
 
     x_left = max(x1_left, x2_left)
     x_right = min(x1_right, x2_right)
@@ -91,30 +84,18 @@ def detect(inputimg, model):
 
     time_mcs = time.microseconds
 
-    total_people = 0
-    incorrect = 0
-    withmask = 0
-    withoutmask = 0
-
+    total_people, incorrect, withmask,withoutmask = 0, 0, 0, 0
+    
     list_objects = []
     isRemove = []
-    for i in result[1]:
-        temp = i
-        temp = np.append(temp, 1)
-        list_objects.append(temp)
-        isRemove.append(0)
 
-    for i in result[2]:
-        temp = i 
-        temp = np.append(temp, 2)
-        list_objects.append(temp)
-        isRemove.append(0)
+    for k in [1,2,3]:
+        for i in result[k]:
+            temp = i
+            temp = np.append(temp, k)
+            list_objects.append(temp)
+            isRemove.append(0) 
 
-    for i in result[3]:
-        temp = i
-        temp = np.append(temp, 3)
-        list_objects.append(temp)
-        isRemove.append(0)
 
     for i in range(len(list_objects) - 1):
         for j in range(i + 1, len(list_objects)):
@@ -127,7 +108,6 @@ def detect(inputimg, model):
                     isRemove[i] = 1
                 # print("IoU", abs(IoU(bbox1, bbox2)))
             
-
             if list_objects[i][4] < 0.4:
                 isRemove[i] = 1
             if list_objects[j][4] < 0.4:
@@ -161,25 +141,17 @@ def detect(inputimg, model):
             color = (0, 0, 255)
             text = "Without mask"
         text += ": " + str(round(i[4], 2))
-        x1 = i[0]
-        y1 = i[1]
-        x2 = i[2] - 1
-        y2 = i[3] - 1
+        x1, y1 = i[0], i[1]
+        x2, y2 = i[2] - 1, i[3] - 1
 
-        x1 = round(x1)
-        y1 = round(y1)
-        x2 = round(x2)
-        y2 = round(y2)
+        x1, y1, x2, y2 = round(x1), round(y1), round(x2), round(y2)
 
         img = cv2.rectangle(img, (x1, y1), (x2, y2), color, 3)
         img = cv2.putText(img, text, (x1, y1-10), cv2.FONT_HERSHEY_SIMPLEX, 0.7, color, 2)
     output ="result_demo.jpg"
     return img, total_people, incorrect, withmask, withoutmask, time_mcs/1000
 
-st.title("Demo đồ án môn học CS331 - Thị giác máy tính nâng cao")
-
-st.write("Lại Chí Thiện - 20520309")
-st.write("Lê Thị Phương Vy - 20520355")
+st.title("Face Mask Detection App")
 
 file_page, webcam_page, phonecam_page = st.tabs(["File", "Webcam", "Phone's camera"])