dataset-tools 0.2.2__tar.gz → 0.2.3__tar.gz

{dataset_tools-0.2.2 → dataset_tools-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dataset-tools
-Version: 0.2.2
+Version: 0.2.3
 Summary: Dataset tools for dataset ninja made by Supervisely team.
 Home-page: https://github.com/supervisely/dataset-tools
 Author: Supervisely

dataset_tools-0.2.3/dataset_tools/image/pillow_compat.py

@@ -0,0 +1,18 @@
+from PIL import ImageDraw, ImageFont
+
+
+def _bbox_size(bbox):
+    left, top, right, bottom = bbox
+    return right - left, bottom - top
+
+
+def font_text_size(font: ImageFont.FreeTypeFont, text: str):
+    if hasattr(font, "getbbox"):
+        return _bbox_size(font.getbbox(text))
+    return font.getsize(text)
+
+
+def draw_text_size(draw: ImageDraw.ImageDraw, text: str, font: ImageFont.FreeTypeFont):
+    if hasattr(draw, "textbbox"):
+        return _bbox_size(draw.textbbox((0, 0), text, font=font))
+    return draw.textsize(text, font=font)

{dataset_tools-0.2.2 → dataset_tools-0.2.3}/dataset_tools/image/renders/poster.py

@@ -10,6 +10,7 @@ from PIL import Image, ImageDraw, ImageFont
 from supervisely.imaging import font as sly_font
 from tqdm import tqdm
 
+from dataset_tools.image.pillow_compat import draw_text_size, font_text_size
 from dataset_tools.image.renders.convert import compress_png
 
 CURENT_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -311,7 +312,7 @@ class Poster:
         x_pos_center = int(image_w * 0.5)
         y_pos_percent = int(image_h * 0.5)
 
-        text_width, text_height = font.getsize(text)
+        text_width, text_height = font_text_size(font, text)
         text_color = (0, 0, 0, 210)
 
         tmp_canvas = np.zeros(
@@ -323,7 +324,7 @@ class Poster:
 
         tmp_canvas = Image.fromarray(tmp_canvas)
         draw = ImageDraw.Draw(tmp_canvas)
-        text_width, text_height = draw.textsize(text, font=font)
+        text_width, text_height = draw_text_size(draw, text, font=font)
         draw.text((half_offset, -half_offset // 3), text, font=font, fill=text_color)
 
         tmp_canvas = np.array(tmp_canvas, dtype=np.uint8)
@@ -347,7 +348,7 @@ class Poster:
         while text_width > desired_text_width or text_height > desired_text_height:
             font_size -= 1
             font = font.font_variant(size=font_size)
-            text_width, text_height = font.getsize(text)
+            text_width, text_height = font_text_size(font, text)
 
         desired_font_height = math.ceil((image_h * text_height_percent) // 100)
         desired_font_size = math.ceil(font_size * desired_text_width / text_width)

{dataset_tools-0.2.2 → dataset_tools-0.2.3}/dataset_tools/image/stats/heatmaps_for_classes.py

@@ -10,6 +10,7 @@ from PIL import Image, ImageDraw, ImageFont
 from skimage.transform import resize
 from typing import List, Dict
 import supervisely as sly
+from dataset_tools.image.pillow_compat import draw_text_size, font_text_size
 from dataset_tools.image.stats.basestats import BaseVisual
 from supervisely import FigureInfo, ImageInfo
 
@@ -270,7 +271,7 @@ class ClassesHeatmaps(BaseVisual):
 
         for char in characters[1:]:
             temp_line = current_line + char
-            size = font.getsize(temp_line)
+            size = font_text_size(font, temp_line)
 
             if size[0] <= image.size[0]:
                 current_line = temp_line
@@ -315,7 +316,7 @@ class ClassesHeatmaps(BaseVisual):
             font = self._font.font_variant(size=font_size)
             text = f"{heatmap}"
             text_color = (255, 255, 255)
-            text_width, _ = draw.textsize(text, font=font)
+            text_width, _ = draw_text_size(draw, text, font=font)
             text_position = (x_pos_center - int(text_width / 2), y_pos_percent)
             draw.text(text_position, text, font=font, fill=text_color)
             image.save(image_path)
@@ -329,12 +330,12 @@ class ClassesHeatmaps(BaseVisual):
         font_size = 10
 
         font = self._font.font_variant(size=font_size)
-        text_width, _ = font.getsize(text)
+        text_width, _ = font_text_size(font, text)
 
         while text_width > desired_text_width:
             font_size -= 1
             font = font.font_variant(size=font_size)
-            text_width, _ = font.getsize(text)
+            text_width, _ = font_text_size(font, text)
             font.font_variant
 
         desired_font_height = math.ceil((self._heatmap_img_size[0] * text_height_percent) // 100)

{dataset_tools-0.2.2 → dataset_tools-0.2.3}/dataset_tools/image/stats/preview_for_classes.py

@@ -11,6 +11,7 @@ import supervisely as sly
 from PIL import Image, ImageDraw, ImageFont
 from tqdm import tqdm
 
+from dataset_tools.image.pillow_compat import draw_text_size, font_text_size
 from dataset_tools.image.renders.convert import compress_mp4, from_mp4_to_webm
 from dataset_tools.image.stats.basestats import BaseVisual
 
@@ -388,7 +389,7 @@ class ClassesPreview(BaseVisual):
         x_pos_center = int(image_w * 0.5)
         y_pos_percent = self._gap * 2
 
-        text_width, text_height = font.getsize(text)
+        text_width, text_height = font_text_size(font, text)
         text_color = (255, 255, 255, 255)
 
         tmp_canvas = np.zeros(
@@ -401,7 +402,7 @@ class ClassesPreview(BaseVisual):
         tmp_canvas = Image.fromarray(tmp_canvas)
         canvas_w, canvas_h = tmp_canvas.size
         draw = ImageDraw.Draw(tmp_canvas)
-        text_width, text_height = draw.textsize(text, font=font)
+        text_width, text_height = draw_text_size(draw, text, font=font)
         x, y = (x_pos_center - int(text_width / 2), y_pos_percent)
         draw.text((canvas_w // 2, canvas_h // 2), text, text_color, font, "mm")
 
@@ -421,14 +422,14 @@ class ClassesPreview(BaseVisual):
 
         font = ImageFont.truetype(self._font, font_size)
 
-        text_width, text_height = font.getsize(text)
+        text_width, text_height = font_text_size(font, text)
 
         while text_width > desired_text_width or text_height > desired_text_height:
             font_size -= 1
             if font_size < 1:
                 break
             font = ImageFont.truetype(self._font, font_size)
-            text_width, text_height = font.getsize(text)
+            text_width, text_height = font_text_size(font, text)
 
         desired_font_height = math.ceil((image_h * text_height_percent) // 100)
         desired_font_size = math.ceil(font_size * desired_text_width / text_width)

{dataset_tools-0.2.2 → dataset_tools-0.2.3}/dataset_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dataset-tools
-Version: 0.2.2
+Version: 0.2.3
 Summary: Dataset tools for dataset ninja made by Supervisely team.
 Home-page: https://github.com/supervisely/dataset-tools
 Author: Supervisely

{dataset_tools-0.2.2 → dataset_tools-0.2.3}/dataset_tools.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ dataset_tools/fonts/FiraSans-SemiBoldItalic.ttf
 dataset_tools/fonts/FiraSans-Thin.ttf
 dataset_tools/fonts/FiraSans-ThinItalic.ttf
 dataset_tools/image/__init__.py
+dataset_tools/image/pillow_compat.py
 dataset_tools/image/renders/__init__.py
 dataset_tools/image/renders/convert.py
 dataset_tools/image/renders/horizontal_grid.py