From 946c3a08df7d22e134bc55536a70de3dd3c0483e Mon Sep 17 00:00:00 2001 From: whjdark Date: Wed, 13 Jul 2022 19:54:27 +0800 Subject: [PATCH 1/4] new new commit --- PPOCRLabel/PPOCRLabel.py | 1 - PPOCRLabel/libs/shape.py | 1 - 2 files changed, 2 deletions(-) diff --git a/PPOCRLabel/PPOCRLabel.py b/PPOCRLabel/PPOCRLabel.py index 8538e8ed3f..440c2d8c3e 100644 --- a/PPOCRLabel/PPOCRLabel.py +++ b/PPOCRLabel/PPOCRLabel.py @@ -21,7 +21,6 @@ import os.path import platform import subprocess import sys -from tkinter.tix import Tree import xlrd from functools import partial diff --git a/PPOCRLabel/libs/shape.py b/PPOCRLabel/libs/shape.py index af12a5eb53..180456a10c 100644 --- a/PPOCRLabel/libs/shape.py +++ b/PPOCRLabel/libs/shape.py @@ -12,7 +12,6 @@ # THE SOFTWARE. # !/usr/bin/python # -*- coding: utf-8 -*- -from email.policy import default import math import sys From 8a98fb0c86ffa70fe135c4a2aa511b66eb320b3d Mon Sep 17 00:00:00 2001 From: whjdark Date: Wed, 20 Jul 2022 18:44:57 +0800 Subject: [PATCH 2/4] new commit --- PPOCRLabel/libs/shape.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PPOCRLabel/libs/shape.py b/PPOCRLabel/libs/shape.py index 180456a10c..1b32a6af14 100644 --- a/PPOCRLabel/libs/shape.py +++ b/PPOCRLabel/libs/shape.py @@ -125,7 +125,8 @@ class Shape(object): color = self.select_line_color if self.selected else self.line_color pen = QPen(color) # Try using integer sizes for smoother drawing(?) - pen.setWidth(max(1, int(round(2.0 / self.scale)))) + # no need, it casuses that font is too small in high-resolusion image + # pen.setWidth(max(1, int(round(2.0 / self.scale)))) painter.setPen(pen) line_path = QPainterPath() From 81f29c936f2e1d03b6d7344ab366c73238cac5f4 Mon Sep 17 00:00:00 2001 From: whjdark Date: Thu, 21 Jul 2022 15:28:03 +0800 Subject: [PATCH 3/4] new commit --- PPOCRLabel/libs/canvas.py | 7 +++++++ PPOCRLabel/libs/shape.py | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/PPOCRLabel/libs/canvas.py b/PPOCRLabel/libs/canvas.py index 780ca71af5..81f3799512 100644 --- a/PPOCRLabel/libs/canvas.py +++ b/PPOCRLabel/libs/canvas.py @@ -624,6 +624,13 @@ class Canvas(QWidget): pal.setColor(self.backgroundRole(), QColor(232, 232, 232, 255)) self.setPalette(pal) + # adaptive BBOX label & index font size + if self.pixmap: + h, w = self.pixmap.size().height(), self.pixmap.size().width() + fontszie = int(max(h, w) / 48) + for s in self.shapes: + s.fontsize = fontszie + p.end() def fillDrawing(self): diff --git a/PPOCRLabel/libs/shape.py b/PPOCRLabel/libs/shape.py index 1b32a6af14..4e0b1f08c6 100644 --- a/PPOCRLabel/libs/shape.py +++ b/PPOCRLabel/libs/shape.py @@ -66,6 +66,7 @@ class Shape(object): self.NEAR_VERTEX: (4, self.P_ROUND), self.MOVE_VERTEX: (1.5, self.P_SQUARE), } + self.fontsize = 8 self._closed = False @@ -157,7 +158,7 @@ class Shape(object): min_y = min(min_y, point.y()) if min_x != sys.maxsize and min_y != sys.maxsize: font = QFont() - font.setPointSize(8) + font.setPointSize(self.fontsize) font.setBold(True) painter.setFont(font) if self.label is None: @@ -175,7 +176,7 @@ class Shape(object): min_y = min(min_y, point.y()) if min_x != sys.maxsize and min_y != sys.maxsize: font = QFont() - font.setPointSize(8) + font.setPointSize(self.fontsize) font.setBold(True) painter.setFont(font) text = '' From d03b25b0e5a821407f5fb2d3cb52a297affa7c08 Mon Sep 17 00:00:00 2001 From: Evezerest <50011306+Evezerest@users.noreply.github.com> Date: Tue, 26 Jul 2022 15:30:38 +0800 Subject: [PATCH 4/4] Update shape.py --- PPOCRLabel/libs/shape.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PPOCRLabel/libs/shape.py b/PPOCRLabel/libs/shape.py index 4e0b1f08c6..121e43b8ae 100644 --- a/PPOCRLabel/libs/shape.py +++ b/PPOCRLabel/libs/shape.py @@ -126,8 +126,7 @@ class Shape(object): color = self.select_line_color if self.selected else self.line_color pen = QPen(color) # Try using integer sizes for smoother drawing(?) - # no need, it casuses that font is too small in high-resolusion image - # pen.setWidth(max(1, int(round(2.0 / self.scale)))) + pen.setWidth(max(1, int(round(2.0 / self.scale)))) painter.setPen(pen) line_path = QPainterPath()