pybaseutils 2.0.9__tar.gz → 2.1.0__tar.gz

{pybaseutils-2.0.9 → pybaseutils-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.0.9
+Version: 2.1.0
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.0.9 → pybaseutils-2.1.0}/pybaseutils/__init__.py

@@ -5,4 +5,4 @@
     @Date   : 2019-05-07 17:40:27
 """
 
-__version__ = '2.0.9'
+__version__ = '2.1.0'

{pybaseutils-2.0.9 → pybaseutils-2.1.0}/pybaseutils/dataloader/parser_image_text.py

@@ -35,7 +35,7 @@ class TextDataset(Dataset):
         :param phase:
         :param disp:
         :param check:
-        :param kwargs: crop_scale,resample,save_info
+        :param kwargs: use_max,use_mean,crop_scale,resample,save_info
         """
         self.kwargs = kwargs
         self.use_rgb = use_rgb
@@ -165,7 +165,7 @@ class TextDataset(Dataset):
         bbox = item[2:] if len(item) == 6 else []
         image_file, label = item[0], item[1]
         image = self.read_image(image_file, use_rgb=self.use_rgb)
-        image = self.crop_image(image, bbox=bbox, scale=self.kwargs.get("crop_scale", [1.2, 1.2])) if bbox else image
+        image = self.crop_image(image, bbox=bbox, **self.kwargs) if bbox else image
         if self.transform:
             image = Image.fromarray(image)
             image = self.transform(image)
@@ -179,11 +179,13 @@ class TextDataset(Dataset):
             self.item_list = self.data_resample.update(True)
         return len(self.item_list)
 
-    def crop_image(self, image, bbox, scale=[1.2, 1.2]):
+    def crop_image(self, image, bbox, **kwargs):
         """裁剪图片"""
-        if not bbox: return image
-        boxes = image_utils.get_square_boxes([bbox], use_max=True)
-        boxes = image_utils.extend_xyxy(boxes, scale=scale)
+        if len(bbox) == 0: return image
+        boxes = image_utils.get_square_boxes(boxes=[bbox],
+                                             use_max=kwargs.get("use_max", False),
+                                             use_mean=kwargs.get("use_mean", True))
+        boxes = image_utils.extend_xyxy(boxes, scale=kwargs.get("crop_scale", []))
         image = image_utils.get_boxes_crop(image, boxes)[0]
         return image
 
@@ -260,8 +262,8 @@ if __name__ == '__main__':
                           transform=transform,
                           class_name=class_name,
                           resample=False,
-                          shuffle=False,
-                          # crop_scale=(1.2, 1.2),
+                          shuffle=True,
+                          crop_scale=(1.5, 1.5),
                           disp=True)
     for i in range(len(dataset)):
         data_info = dataset.__getitem__(i)

{pybaseutils-2.0.9 → pybaseutils-2.1.0}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.0.9
+Version: 2.1.0
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan