From d3ae86ffd64eedd26fc58e2dae7312d32f249c6a Mon Sep 17 00:00:00 2001
From: hpc203 <1749069040@qq.com>
Date: Sat, 5 Nov 2022 11:43:15 +0800
Subject: [PATCH 1/2] Update main.py

---
 opencv/main.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/opencv/main.py b/opencv/main.py
index 40463aa..57eb3a1 100644
--- a/opencv/main.py
+++ b/opencv/main.py
@@ -108,13 +108,10 @@ def extract_boxes(self, predictions):
         # Scale boxes to original image dimensions
         boxes = self.rescale_boxes(boxes)
         
-        # Convert boxes to xyxy format
+        # Convert boxes to xywh format
         boxes_ = np.copy(boxes)
         boxes_[..., 0] = boxes[..., 0] - boxes[..., 2] * 0.5
         boxes_[..., 1] = boxes[..., 1] - boxes[..., 3] * 0.5
-        boxes_[..., 2] = boxes[..., 0] + boxes[..., 2] * 0.5
-        boxes_[..., 3] = boxes[..., 1] + boxes[..., 3] * 0.5
-        
         return boxes_
     
     def rescale_boxes(self, boxes):
@@ -127,16 +124,16 @@ def rescale_boxes(self, boxes):
     
     def draw_detections(self, image, boxes, scores, class_ids):
         for box, score, class_id in zip(boxes, scores, class_ids):
-            x1, y1, x2, y2 = box.astype(int)
+            x, y, w, h = box.astype(int)
             
             # Draw rectangle
-            cv2.rectangle(image, (x1, y1), (x2, y2), (0, 0, 255), thickness=2)
+            cv2.rectangle(image, (x, y), (x+w, y+h), (0, 0, 255), thickness=2)
             label = self.class_names[class_id]
             label = f'{label} {int(score * 100)}%'
             labelSize, baseLine = cv2.getTextSize(label, cv2.FONT_HERSHEY_SIMPLEX, 0.5, 1)
             # top = max(y1, labelSize[1])
             # cv.rectangle(frame, (left, top - round(1.5 * labelSize[1])), (left + round(1.5 * labelSize[0]), top + baseLine), (255,255,255), cv.FILLED)
-            cv2.putText(image, label, (x1, y1 - 10), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), thickness=2)
+            cv2.putText(image, label, (x, y - 10), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), thickness=2)
         return image
 
 

From 696497d701c7c66cac40dd0f868173c61efa5652 Mon Sep 17 00:00:00 2001
From: hpc203 <1749069040@qq.com>
Date: Sat, 5 Nov 2022 11:44:19 +0800
Subject: [PATCH 2/2] Update main.py

---
 onnxruntime/main.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/onnxruntime/main.py b/onnxruntime/main.py
index 48c3fe8..f8a89cf 100644
--- a/onnxruntime/main.py
+++ b/onnxruntime/main.py
@@ -112,13 +112,10 @@ def extract_boxes(self, predictions):
         # Scale boxes to original image dimensions
         boxes = self.rescale_boxes(boxes)
         
-        # Convert boxes to xyxy format
+        # Convert boxes to xywh format
         boxes_ = np.copy(boxes)
         boxes_[..., 0] = boxes[..., 0] - boxes[..., 2] * 0.5
-        boxes_[..., 1] = boxes[..., 1] - boxes[..., 3] * 0.5
-        boxes_[..., 2] = boxes[..., 0] + boxes[..., 2] * 0.5
-        boxes_[..., 3] = boxes[..., 1] + boxes[..., 3] * 0.5
-        
+        boxes_[..., 1] = boxes[..., 1] - boxes[..., 3] * 0.5 
         return boxes_
     
     def rescale_boxes(self, boxes):
@@ -131,16 +128,16 @@ def rescale_boxes(self, boxes):
     
     def draw_detections(self, image, boxes, scores, class_ids):
         for box, score, class_id in zip(boxes, scores, class_ids):
-            x1, y1, x2, y2 = box.astype(int)
+            x, y, w, h = box.astype(int)
             
             # Draw rectangle
-            cv2.rectangle(image, (x1, y1), (x2, y2), (0, 0, 255), thickness=2)
+            cv2.rectangle(image, (x, y), (x+w, y+h), (0, 0, 255), thickness=2)
             label = self.class_names[class_id]
             label = f'{label} {int(score * 100)}%'
             labelSize, baseLine = cv2.getTextSize(label, cv2.FONT_HERSHEY_SIMPLEX, 0.5, 1)
             # top = max(y1, labelSize[1])
             # cv.rectangle(frame, (left, top - round(1.5 * labelSize[1])), (left + round(1.5 * labelSize[0]), top + baseLine), (255,255,255), cv.FILLED)
-            cv2.putText(image, label, (x1, y1 - 10), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), thickness=2)
+            cv2.putText(image, label, (x, y - 10), cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), thickness=2)
         return image