From 680a1960df355e896f7c732da03c337f588ef052 Mon Sep 17 00:00:00 2001
From: et <elhoussinetalab@gmail.com>
Date: Sun, 5 Sep 2021 12:23:44 +0200
Subject: [PATCH 1/5] adding get cropped functionality

---
 models/common.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/models/common.py b/models/common.py
index 90bfef5124b3..cb46cba36a20 100644
--- a/models/common.py
+++ b/models/common.py
@@ -396,6 +396,35 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
             if render:
                 self.imgs[i] = np.asarray(im)
 
+    def get_cropped(self): 
+        """
+        returns list of dicts containing cropped detections and their labels 
+        >>> result.get_cropped()
+            [
+                { 
+                    'label': <label> <accuracy> 
+                    'img': <cropped np image> 
+                }, 
+                { 
+                    'label': <label> <accuracy> 
+                    'img': <cropped np image> 
+                }, 
+                ...
+            ]
+        """
+        res = [] 
+        for i, (im, pred) in enumerate(zip(self.imgs, self.pred)):
+            assert pred != None, "prediction result is empty, no object detected"
+            for *box, conf, cls in pred:  # xyxy, confidence, class
+                label = f'{self.names[int(cls)]} {conf:.2f}'
+                cropped_img = save_one_box(box, im, save=False)
+                res.append({ 
+                    'label': label, 
+                    'img': cropped_img
+                })
+        return res 
+
+
     def print(self):
         self.display(pprint=True)  # print results
         LOGGER.info(f'Speed: %.1fms pre-process, %.1fms inference, %.1fms NMS per image at shape {tuple(self.s)}' %

From 23acc133fc3f07299abdb836f408872a6d29c176 Mon Sep 17 00:00:00 2001
From: et <elhoussinetalab@gmail.com>
Date: Sun, 5 Sep 2021 18:55:36 +0200
Subject: [PATCH 2/5] Add target logic in existing functions

---
 models/common.py | 47 +++++++++++++----------------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

diff --git a/models/common.py b/models/common.py
index cb46cba36a20..50ea9890c684 100644
--- a/models/common.py
+++ b/models/common.py
@@ -373,10 +373,13 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                     str += f"{n} {self.names[int(c)]}{'s' * (n > 1)}, "  # add to string
                 if show or save or render or crop:
                     annotator = Annotator(im, pil=not self.ascii)
+                    cropped = [] 
                     for *box, conf, cls in reversed(pred):  # xyxy, confidence, class
                         label = f'{self.names[int(cls)]} {conf:.2f}'
                         if crop:
-                            save_one_box(box, im, file=save_dir / 'crops' / self.names[int(cls)] / self.files[i])
+                            cropped_save_dir = save_dir / 'crops' / self.names[int(cls)] / self.files[i] if save else None
+                            cropped_box = save_one_box(box, im, file=cropped_save_dir, save=save)
+                            cropped.append({'label': label,'img': cropped_box})
                         else:  # all others
                             annotator.box_label(box, label, color=colors(cls))
                     im = annotator.im
@@ -395,35 +398,9 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                     LOGGER.info(f"Saved {self.n} image{'s' * (self.n > 1)} to {colorstr('bold', save_dir)}")
             if render:
                 self.imgs[i] = np.asarray(im)
-
-    def get_cropped(self): 
-        """
-        returns list of dicts containing cropped detections and their labels 
-        >>> result.get_cropped()
-            [
-                { 
-                    'label': <label> <accuracy> 
-                    'img': <cropped np image> 
-                }, 
-                { 
-                    'label': <label> <accuracy> 
-                    'img': <cropped np image> 
-                }, 
-                ...
-            ]
-        """
-        res = [] 
-        for i, (im, pred) in enumerate(zip(self.imgs, self.pred)):
-            assert pred != None, "prediction result is empty, no object detected"
-            for *box, conf, cls in pred:  # xyxy, confidence, class
-                label = f'{self.names[int(cls)]} {conf:.2f}'
-                cropped_img = save_one_box(box, im, save=False)
-                res.append({ 
-                    'label': label, 
-                    'img': cropped_img
-                })
-        return res 
-
+            
+            if crop: 
+                return cropped
 
     def print(self):
         self.display(pprint=True)  # print results
@@ -437,10 +414,12 @@ def save(self, save_dir='runs/detect/exp'):
         save_dir = increment_path(save_dir, exist_ok=save_dir != 'runs/detect/exp', mkdir=True)  # increment save_dir
         self.display(save=True, save_dir=save_dir)  # save results
 
-    def crop(self, save_dir='runs/detect/exp'):
-        save_dir = increment_path(save_dir, exist_ok=save_dir != 'runs/detect/exp', mkdir=True)  # increment save_dir
-        self.display(crop=True, save_dir=save_dir)  # crop results
-        LOGGER.info(f'Saved results to {save_dir}\n')
+    def crop(self, save=True, save_dir='runs/detect/exp'):
+        save_dir = increment_path(save_dir, exist_ok=save_dir != 'runs/detect/exp', mkdir=True) if save else None
+        cropped = self.display(crop=True, save=save, save_dir=save_dir)  # crop results
+        if save: 
+            LOGGER.info(f'Saved results to {save_dir}\n')
+        return cropped 
 
     def render(self):
         self.display(render=True)  # render results

From 7bea69582c518af65204f8ceee394c84ad56720c Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Wed, 8 Sep 2021 19:26:22 +0200
Subject: [PATCH 3/5] Crops cleanup

---
 models/common.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/models/common.py b/models/common.py
index 50ea9890c684..b7cd9a456fc7 100644
--- a/models/common.py
+++ b/models/common.py
@@ -372,14 +372,12 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                     n = (pred[:, -1] == c).sum()  # detections per class
                     str += f"{n} {self.names[int(c)]}{'s' * (n > 1)}, "  # add to string
                 if show or save or render or crop:
-                    annotator = Annotator(im, pil=not self.ascii)
-                    cropped = [] 
+                    annotator, crops = Annotator(im, pil=not self.ascii), []
                     for *box, conf, cls in reversed(pred):  # xyxy, confidence, class
                         label = f'{self.names[int(cls)]} {conf:.2f}'
                         if crop:
-                            cropped_save_dir = save_dir / 'crops' / self.names[int(cls)] / self.files[i] if save else None
-                            cropped_box = save_one_box(box, im, file=cropped_save_dir, save=save)
-                            cropped.append({'label': label,'img': cropped_box})
+                            file = save_dir / 'crops' / self.names[int(cls)] / self.files[i] if save else None
+                            crops.append({'label': label, 'im': save_one_box(box, im, file=file, save=save)})
                         else:  # all others
                             annotator.box_label(box, label, color=colors(cls))
                     im = annotator.im
@@ -398,9 +396,8 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                     LOGGER.info(f"Saved {self.n} image{'s' * (self.n > 1)} to {colorstr('bold', save_dir)}")
             if render:
                 self.imgs[i] = np.asarray(im)
-            
-            if crop: 
-                return cropped
+            if crop:
+                return crops
 
     def print(self):
         self.display(pprint=True)  # print results
@@ -416,10 +413,10 @@ def save(self, save_dir='runs/detect/exp'):
 
     def crop(self, save=True, save_dir='runs/detect/exp'):
         save_dir = increment_path(save_dir, exist_ok=save_dir != 'runs/detect/exp', mkdir=True) if save else None
-        cropped = self.display(crop=True, save=save, save_dir=save_dir)  # crop results
-        if save: 
+        crops = self.display(crop=True, save=save, save_dir=save_dir)  # crop results
+        if save:
             LOGGER.info(f'Saved results to {save_dir}\n')
-        return cropped 
+        return crops
 
     def render(self):
         self.display(render=True)  # render results

From 1a6d65c0b6b9410108a84dfaaf6ede9a1d06856c Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Wed, 8 Sep 2021 19:31:07 +0200
Subject: [PATCH 4/5] Add dictionary keys: conf, cls, box

---
 models/common.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/models/common.py b/models/common.py
index b7cd9a456fc7..62e8e236bd84 100644
--- a/models/common.py
+++ b/models/common.py
@@ -377,7 +377,8 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                         label = f'{self.names[int(cls)]} {conf:.2f}'
                         if crop:
                             file = save_dir / 'crops' / self.names[int(cls)] / self.files[i] if save else None
-                            crops.append({'label': label, 'im': save_one_box(box, im, file=file, save=save)})
+                            crops.append({'box': box, 'conf': conf, 'cls': cls, 'label': label,
+                                          'im': save_one_box(box, im, file=file, save=save)})
                         else:  # all others
                             annotator.box_label(box, label, color=colors(cls))
                     im = annotator.im

From 0fb3b36173919487393675d86e85278e22512050 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Wed, 8 Sep 2021 19:35:40 +0200
Subject: [PATCH 5/5] Bug fixes - avoid return after first image

---
 models/common.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/models/common.py b/models/common.py
index 62e8e236bd84..e79b8a9d2644 100644
--- a/models/common.py
+++ b/models/common.py
@@ -365,6 +365,7 @@ def __init__(self, imgs, pred, files, times=None, names=None, shape=None):
         self.s = shape  # inference BCHW shape
 
     def display(self, pprint=False, show=False, save=False, crop=False, render=False, save_dir=Path('')):
+        crops = []
         for i, (im, pred) in enumerate(zip(self.imgs, self.pred)):
             str = f'image {i + 1}/{len(self.pred)}: {im.shape[0]}x{im.shape[1]} '
             if pred.shape[0]:
@@ -372,7 +373,7 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                     n = (pred[:, -1] == c).sum()  # detections per class
                     str += f"{n} {self.names[int(c)]}{'s' * (n > 1)}, "  # add to string
                 if show or save or render or crop:
-                    annotator, crops = Annotator(im, pil=not self.ascii), []
+                    annotator = Annotator(im, pil=not self.ascii)
                     for *box, conf, cls in reversed(pred):  # xyxy, confidence, class
                         label = f'{self.names[int(cls)]} {conf:.2f}'
                         if crop:
@@ -397,8 +398,10 @@ def display(self, pprint=False, show=False, save=False, crop=False, render=False
                     LOGGER.info(f"Saved {self.n} image{'s' * (self.n > 1)} to {colorstr('bold', save_dir)}")
             if render:
                 self.imgs[i] = np.asarray(im)
-            if crop:
-                return crops
+        if crop:
+            if save:
+                LOGGER.info(f'Saved results to {save_dir}\n')
+            return crops
 
     def print(self):
         self.display(pprint=True)  # print results
@@ -414,10 +417,7 @@ def save(self, save_dir='runs/detect/exp'):
 
     def crop(self, save=True, save_dir='runs/detect/exp'):
         save_dir = increment_path(save_dir, exist_ok=save_dir != 'runs/detect/exp', mkdir=True) if save else None
-        crops = self.display(crop=True, save=save, save_dir=save_dir)  # crop results
-        if save:
-            LOGGER.info(f'Saved results to {save_dir}\n')
-        return crops
+        return self.display(crop=True, save=save, save_dir=save_dir)  # crop results
 
     def render(self):
         self.display(render=True)  # render results