From f57279156221d5a6aabee001f8fc4263d459ab09 Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Wed, 5 Jun 2024 16:50:48 +0200
Subject: [PATCH] Test covers labeling with default font
---
model_server/base/annotators.py | 6 +++---
tests/test_roiset.py | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/model_server/base/annotators.py b/model_server/base/annotators.py
index c498fb8e..f0e1df91 100644
--- a/model_server/base/annotators.py
+++ b/model_server/base/annotators.py
@@ -4,20 +4,20 @@ from PIL import Image, ImageDraw, ImageFont
from model_server.base.process import rescale
-def _get_font():
+def _get_font(font_size=18):
return ImageFont.truetype(
font_manager.findfont(
font_manager.FontProperties(
family='sans-serif',
weight='bold'
)
- )
+ ),
+ size=font_size,
)
def draw_boxes_on_3d_image(roiset, draw_full_depth=False, **kwargs):
h, w, chroma, nz = roiset.acc_raw.shape
- font_size = kwargs.get('font_size', 18)
linewidth = kwargs.get('linewidth', 4)
if ck := kwargs.get('channel'):
diff --git a/tests/test_roiset.py b/tests/test_roiset.py
index d45c6132..56b8de70 100644
--- a/tests/test_roiset.py
+++ b/tests/test_roiset.py
@@ -365,6 +365,7 @@ class TestRoiSetMultichannelProducts(BaseTestRoiSetMonoProducts, unittest.TestCa
'test_multichannel_annotated_zstack',
expanded=True,
pad_to=256,
+ draw_label=True,
)
result = generate_file_accessor(where / file)
self.assertEqual(result.chroma, self.stack.chroma)
@@ -377,6 +378,7 @@ class TestRoiSetMultichannelProducts(BaseTestRoiSetMonoProducts, unittest.TestCa
channel=3,
expanded=True,
pad_to=256,
+ draw_label=True,
)
result = generate_file_accessor(where / file)
self.assertEqual(result.hw, self.roiset.acc_raw.hw)
--
GitLab