Commit d0da4681 authored by dmMaze's avatar dmMaze
Browse files

fix drawingboard size on macos

parent 36ae2473

requirements.txt

+1 −1
Original line number Diff line number Diff line 
# To install pytorch cuda (gpu) version, please look https://pytorch.org/



PyQt6-Qt6==6.4.2    # framelesswindow is broken for qt>6.4.2 on windows, text rendering is wrong on macOS

PyQt6-Qt6==6.4.2    # ffor qt>6.4.2 , framelesswindow is broken on windows, and text rendering is wrong on macOS

PyQt6==6.4.2   #PyQt5>=5.15.9

numpy

urllib3==1.25.11 # https://github.com/psf/requests/issues/5740

tests/ui/text_rendering.py

+1 −3
Original line number Diff line number Diff line
@@ -13,13 +13,11 @@ if __name__ == '__main__': 


    os.chdir(APP_ROOT)







    from launch import main, args

    from ui.config_proj import ProjImgTrans

    from utils.io_utils import imread, imwrite, json_dump_nested_obj



    test_dir = 'test_dir/text_rendering'

    test_dir = 'tests/test_dir/text_rendering'

    if not osp.exists(test_dir):

        os.makedirs(test_dir)

ui/configpanel.py

+49 −28
Original line number Diff line number Diff line 
from typing import List, Union, Tuple



from qtpy.QtWidgets import QKeySequenceEdit, QLayout, QHBoxLayout, QVBoxLayout, QTreeView, QWidget, QLabel, QSizePolicy, QSpacerItem, QCheckBox, QSplitter, QScrollArea, QGroupBox, QLineEdit

from qtpy.QtWidgets import QKeySequenceEdit, QLayout, QGridLayout, QHBoxLayout, QVBoxLayout, QTreeView, QFrame, QWidget, QLabel, QSizePolicy, QSpacerItem, QCheckBox, QSplitter, QScrollArea, QGroupBox, QLineEdit

from qtpy.QtCore import Qt, Signal, QSize, QEvent, QItemSelection

from qtpy.QtGui import QStandardItem, QStandardItemModel, QMouseEvent, QFont, QColor, QPalette

from qtpy import API
@@ -42,7 +42,7 @@ class ConfigTextLabel(QLabel): 


class ConfigSubBlock(Widget):

    pressed = Signal(int, int)

    def __init__(self, widget: Union[QWidget, QLayout], name: str = None, discription: str = None, vertical_layout=True) -> None:

    def __init__(self, widget: Union[QWidget, QLayout], name: str = None, discription: str = None, vertical_layout=True, insert_stretch: bool = False, content_margins = (24, 6, 24, 6)) -> None:

        super().__init__()

        self.idx0: int = None

        self.idx1: int = None
@@ -56,12 +56,14 @@ class ConfigSubBlock(Widget): 
            layout.addWidget(textlabel)

        if discription is not None:

            layout.addWidget(ConfigTextLabel(discription, CONFIG_FONTSIZE_CONTENT-2))

        if insert_stretch:

            layout.insertStretch(-1)

        if isinstance(widget, QWidget):

            layout.addWidget(widget)

        else:

            layout.addLayout(widget)

        self.widget = widget

        self.setContentsMargins(24, 6, 24, 6)

        self.setContentsMargins(*content_margins)



    def setIdx(self, idx0: int, idx1: int) -> None:

        self.idx0 = idx0
@@ -72,6 +74,22 @@ class ConfigSubBlock(Widget): 
        return super().enterEvent(e)

    



def combobox_with_label(sel: List[str], name: str, discription: str = None, vertical_layout: bool = False, target_block: QWidget = None, fix_size: bool = True, parent: QWidget = None, insert_stretch: bool = False) -> Tuple[ConfigComboBox, QWidget]:

    combox = ConfigComboBox(fix_size=fix_size, scrollWidget=parent)

    combox.addItems(sel)

    if target_block is None:

        sublock = ConfigSubBlock(combox, name, discription, vertical_layout=vertical_layout, insert_stretch=insert_stretch)

        sublock.layout().setAlignment(Qt.AlignmentFlag.AlignLeft)

        sublock.layout().setSpacing(20)

        return combox, sublock

    else:

        layout = target_block.layout()

        layout.addSpacing(20)

        layout.addWidget(ConfigTextLabel(name, CONFIG_FONTSIZE_CONTENT, QFont.Weight.Normal))

        layout.addWidget(combox)

        return combox, target_block





class ConfigBlock(Widget):

    sublock_pressed = Signal(int, int)
@@ -111,19 +129,11 @@ class ConfigBlock(Widget): 
        self.subblock_list.append(sublock)



    def addCombobox(self, sel: List[str], name: str, discription: str = None, vertical_layout: bool = False, target_block: QWidget = None, fix_size: bool = True) -> Tuple[ConfigComboBox, QWidget]:

        combox, sublock = combobox_with_label(sel, name, discription, vertical_layout, target_block, fix_size, parent=self)

        combox = ConfigComboBox(fix_size=fix_size, scrollWidget=self)

        combox.addItems(sel)

        if target_block is None:

            sublock = ConfigSubBlock(combox, name, discription, vertical_layout=vertical_layout)

            sublock.layout().setAlignment(Qt.AlignmentFlag.AlignLeft)

            sublock.layout().setSpacing(20)

            self.addSublock(sublock)

            return combox, sublock

        else:

            layout = target_block.layout()

            layout.addSpacing(20)

            layout.addWidget(ConfigTextLabel(name, CONFIG_FONTSIZE_CONTENT, QFont.Weight.Normal))

            layout.addWidget(combox)

        return combox, target_block



    def addBlockWidget(self, widget: Union[QWidget, QLayout], name: str = None, discription: str = None, vertical_layout: bool = False) -> ConfigSubBlock:
@@ -329,20 +339,36 @@ class ConfigPanel(Widget): 
        dec_program_str = self.tr('decide by program')

        use_global_str = self.tr('use global setting')



        self.let_fntsize_combox, letblk_0 = generalConfigPanel.addCombobox([dec_program_str, use_global_str], self.tr('font size'))

        global_fntfmt_widget = QWidget()

        global_fntfmt_layout = QGridLayout(global_fntfmt_widget)

        global_fntfmt_layout.setSpacing(0)

        global_fntfmt_widget.setContentsMargins(0, 0, 0, 0)



        b = generalConfigPanel.addBlockWidget(global_fntfmt_widget)

        b.layout().setContentsMargins(0, 0, 0, 0)

        b.setContentsMargins(0, 0, 0, 0)

        self.let_fntsize_combox, sublock = combobox_with_label([dec_program_str, use_global_str], self.tr('Font Size'), parent=self, insert_stretch=True)

        global_fntfmt_layout.addWidget(sublock, 0, 0)



        self.let_fntsize_combox.currentIndexChanged.connect(self.on_fntsize_flag_changed)

        self.let_fntstroke_combox, _ = generalConfigPanel.addCombobox([dec_program_str, use_global_str], self.tr('stroke size'), target_block=letblk_0)

        self.let_fntstroke_combox, sublock = combobox_with_label([dec_program_str, use_global_str], self.tr('Stroke Size'), parent=self, insert_stretch=True)

        self.let_fntstroke_combox.currentIndexChanged.connect(self.on_fntstroke_flag_changed)

        global_fntfmt_layout.addWidget(sublock, 0, 1)

        

        self.let_fntcolor_combox, letblk_1 = generalConfigPanel.addCombobox([dec_program_str, use_global_str], self.tr('font color'))

        self.let_fntcolor_combox, sublock = combobox_with_label([dec_program_str, use_global_str], self.tr('Font Color'), parent=self, insert_stretch=True)

        self.let_fntcolor_combox.currentIndexChanged.connect(self.on_fontcolor_flag_changed)

        self.let_fnt_scolor_combox, _ = generalConfigPanel.addCombobox([dec_program_str, use_global_str], self.tr('stroke color'), target_block=letblk_1)

        global_fntfmt_layout.addWidget(sublock, 1, 0)

        self.let_fnt_scolor_combox, sublock = combobox_with_label([dec_program_str, use_global_str], self.tr('Stroke Color'), parent=self, insert_stretch=True)

        self.let_fnt_scolor_combox.currentIndexChanged.connect(self.on_font_scolor_flag_changed)

        global_fntfmt_layout.addWidget(sublock, 1, 1)



        self.let_effect_combox, letblk_2 = generalConfigPanel.addCombobox([dec_program_str, use_global_str], self.tr('effect'))

        self.let_effect_combox, sublock = combobox_with_label([dec_program_str, use_global_str], self.tr('Effect'), parent=self, insert_stretch=True)

        self.let_effect_combox.currentIndexChanged.connect(self.on_effect_flag_changed)

        self.let_alignment_combox, _ = generalConfigPanel.addCombobox([dec_program_str, use_global_str], self.tr('alignment'), target_block=letblk_2)

        global_fntfmt_layout.addWidget(sublock, 2, 0)

        self.let_alignment_combox, sublock = combobox_with_label([dec_program_str, use_global_str], self.tr('Alignment'), parent=self, insert_stretch=True)

        self.let_alignment_combox.currentIndexChanged.connect(self.on_alignment_flag_changed)

        global_fntfmt_layout.addWidget(sublock, 2, 1)

        global_fntfmt_layout.addItem(QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding), 0, 2)



        self.let_autolayout_checker = generalConfigPanel.addCheckBox(self.tr('Auto layout'), 

                discription=self.tr('Split translation into multi-lines according to the extracted balloon region. The font size will be adaptively resized if it is set to \"decide by program.\"'))
@@ -353,7 +379,7 @@ class ConfigPanel(Widget): 
        generalConfigPanel.addTextLabel(label_saladict)



        sublock = ConfigSubBlock(ConfigTextLabel(self.tr("<a href=\"https://github.com/dmMaze/BallonsTranslator/tree/master/doc/saladict.md\">Installation guide</a>"), CONFIG_FONTSIZE_CONTENT - 2), vertical_layout=False)

        sublock.layout().addItem(QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding))

        sublock.layout().insertStretch(-1)

        generalConfigPanel.addSublock(sublock)



        self.selectext_minimenu_checker = generalConfigPanel.addCheckBox(self.tr('Show mini menu when selecting text.'))
@@ -362,8 +388,8 @@ class ConfigPanel(Widget): 
        self.saladict_shortcut.keySequenceChanged.connect(self.on_saladict_shortcut_changed)

        self.saladict_shortcut.setFixedWidth(CONFIG_COMBOBOX_MIDEAN)



        sublock = ConfigSubBlock(self.saladict_shortcut, self.tr("shortcut"), vertical_layout=False)

        sublock.layout().addItem(QSpacerItem(0, 0, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding))

        sublock = ConfigSubBlock(self.saladict_shortcut, self.tr("Shortcut"), vertical_layout=False)

        sublock.layout().insertStretch(-1)

        generalConfigPanel.addSublock(sublock)

        self.searchurl_combobox, _ = generalConfigPanel.addCombobox(["https://www.google.com/search?q=", "https://www.bing.com/search?q=", "https://duckduckgo.com/?q=", "https://yandex.com/search/?text=", "http://www.baidu.com/s?wd=", "https://search.yahoo.com/search;?p=", "https://www.urbandictionary.com/define.php?term="], self.tr("Search Engines"), fix_size=False)

        self.searchurl_combobox.setEditable(True)
@@ -447,12 +473,7 @@ class ConfigPanel(Widget): 
        self.configTable.setCurrentItem(idx0, idx1)

        self.configTable.tableitem_pressed.emit(idx0, idx1)



    def showEvent(self, e) -> None:

        self.inpaint_sub_block.layout().addWidget(self.inpaint_config_panel)

        return super().showEvent(e)



    def hideEvent(self, e) -> None:

        self.inpaint_sub_block.layout().removeWidget(self.inpaint_config_panel)

        self.save_config.emit()

        return super().hideEvent(e)

ui/dlconfig_parse_widgets.py

+12 −7
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ class ModuleConfigParseWidget(QWidget): 
        p_layout.addWidget(ParamNameLabel(module_name))

        p_layout.addWidget(self.module_combobox)

        p_layout.setSpacing(15)

        self.p_layout = p_layout



        layout = QVBoxLayout(self)

        self.param_widget_map = {}
@@ -284,7 +285,6 @@ class TranslatorConfigPanel(ModuleConfigParseWidget): 


    def __init__(self, module_name, scrollWidget: QWidget = None, *args, **kwargs) -> None:

        super().__init__(module_name, GET_VALID_TRANSLATORS, scrollWidget=scrollWidget, *args, **kwargs)

        self.translator_combobox = self.module_combobox

        self.translator_changed = self.module_changed

    

        self.source_combobox = ConfigComboBox(scrollWidget=scrollWidget)
@@ -307,36 +307,42 @@ class TranslatorConfigPanel(ModuleConfigParseWidget): 
    def finishSetTranslator(self, translator: BaseTranslator):

        self.source_combobox.blockSignals(True)

        self.target_combobox.blockSignals(True)

        self.translator_combobox.blockSignals(True)

        self.module_combobox.blockSignals(True)



        self.source_combobox.clear()

        self.target_combobox.clear()



        self.source_combobox.addItems(translator.supported_src_list)

        self.target_combobox.addItems(translator.supported_tgt_list)

        self.translator_combobox.setCurrentText(translator.name)

        self.module_combobox.setCurrentText(translator.name)

        self.source_combobox.setCurrentText(translator.lang_source)

        self.target_combobox.setCurrentText(translator.lang_target)

        self.updateModuleParamWidget()

        self.source_combobox.blockSignals(False)

        self.target_combobox.blockSignals(False)

        self.translator_combobox.blockSignals(False)

        self.module_combobox.blockSignals(False)





class InpaintConfigPanel(ModuleConfigParseWidget):

    def __init__(self, module_name: str, scrollWidget: QWidget = None, *args, **kwargs) -> None:

        super().__init__(module_name, GET_VALID_INPAINTERS, scrollWidget = scrollWidget, *args, **kwargs)

        self.inpainter_changed = self.module_changed

        self.inpainter_combobox = self.module_combobox

        self.setInpainter = self.setModule

        self.needInpaintChecker = ParamCheckerBox(self.tr('Let the program decide whether it is necessary to use the selected inpaint method.'))

        self.vlayout.addWidget(self.needInpaintChecker)



    def showEvent(self, e) -> None:

        self.p_layout.addWidget(self.module_combobox)

        super().showEvent(e)



    def hideEvent(self, e) -> None:

        self.p_layout.removeWidget(self.module_combobox)

        return super().hideEvent(e)



class TextDetectConfigPanel(ModuleConfigParseWidget):

    def __init__(self, module_name: str, scrollWidget: QWidget = None, *args, **kwargs) -> None:

        super().__init__(module_name, GET_VALID_TEXTDETECTORS, scrollWidget = scrollWidget, *args, **kwargs)

        self.detector_changed = self.module_changed

        self.detector_combobox = self.module_combobox

        self.setDetector = self.setModule
@@ -347,7 +353,6 @@ class OCRConfigPanel(ModuleConfigParseWidget): 
    def __init__(self, module_name: str, scrollWidget: QWidget = None, *args, **kwargs) -> None:

        super().__init__(module_name, GET_VALID_OCR, scrollWidget = scrollWidget, *args, **kwargs)

        self.ocr_changed = self.module_changed

        self.ocr_combobox = self.module_combobox

        self.setOCR = self.setModule



        self.replaceOCRkeywordBtn = NoBorderPushBtn(self.tr("Keyword substitution for OCR results"), self)

ui/drawingpanel.py

+16 −13
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ class InpaintPanel(Widget): 
    def __init__(self, inpainter_panel: InpaintConfigPanel, *args, **kwargs) -> None:

        super().__init__(*args, **kwargs)



        self.inpainter_panel = inpainter_panel

        self.thicknessSlider = PaintQSlider()

        self.thicknessSlider.setRange(MIN_PEN_SIZE, MAX_PEN_SIZE)

        self.thicknessSlider.valueChanged.connect(self.on_thickness_changed)
@@ -86,8 +85,13 @@ class InpaintPanel(Widget): 
        shape_layout.addWidget(shape_label)

        shape_layout.addWidget(self.shapeCombobox)



        self.inpaint_layout = inpaint_layout = QHBoxLayout()

        inpaint_layout.addWidget(ToolNameLabel(100, self.tr('Inpainter')))

        self.inpainter_panel = inpainter_panel



        layout = QVBoxLayout(self)

        layout.setAlignment(Qt.AlignmentFlag.AlignTop)

        layout.addLayout(inpaint_layout)

        layout.addLayout(thickness_layout)

        layout.addLayout(shape_layout)

        layout.setSpacing(14)
@@ -98,14 +102,11 @@ class InpaintPanel(Widget): 
            self.thicknessChanged.emit(self.thicknessSlider.value())



    def showEvent(self, e) -> None:

        self.inpainter_panel.needInpaintChecker.setVisible(False)

        self.vlayout.addWidget(self.inpainter_panel)

        self.inpaint_layout.addWidget(self.inpainter_panel.module_combobox)

        super().showEvent(e)





    def hideEvent(self, e) -> None:

        self.vlayout.removeWidget(self.inpainter_panel)

        self.inpainter_panel.needInpaintChecker.setVisible(True)

        self.inpaint_layout.removeWidget(self.inpainter_panel.module_combobox)

        return super().hideEvent(e)



    @property
@@ -190,9 +191,8 @@ class RectPanel(Widget): 
    inpaint_btn_clicked = Signal()

    def __init__(self, inpainter_panel: InpaintConfigPanel, *args, **kwargs) -> None:

        super().__init__(*args, **kwargs)

        self.inpainter_panel = inpainter_panel

        self.dilate_label = ToolNameLabel()

        self.dilate_label.setText(self.tr('Dilate'))



        self.dilate_label = ToolNameLabel(100, self.tr('Dilate'))

        self.dilate_slider = PaintQSlider()

        self.dilate_slider.setRange(0, 100)

        self.dilate_slider.valueChanged.connect(self.dilate_ksize_changed)
@@ -213,6 +213,10 @@ class RectPanel(Widget): 
        self.btnlayout.addWidget(self.inpaint_btn)

        self.btnlayout.addWidget(self.delete_btn)



        self.inpaint_layout = inpaint_layout = QHBoxLayout()

        inpaint_layout.addWidget(ToolNameLabel(100, self.tr('Inpainter')))

        self.inpainter_panel = inpainter_panel



        glayout = QGridLayout()

        glayout.addWidget(self.dilate_label, 0, 0)

        glayout.addWidget(self.dilate_slider, 0, 1)
@@ -221,19 +225,18 @@ class RectPanel(Widget): 


        layout = QVBoxLayout(self)

        layout.setAlignment(Qt.AlignmentFlag.AlignTop)

        layout.addLayout(inpaint_layout)

        layout.addLayout(glayout)

        layout.addLayout(self.btnlayout)

        layout.setSpacing(14)

        self.vlayout = layout



    def showEvent(self, e) -> None:

        self.inpainter_panel.needInpaintChecker.setVisible(False)

        self.vlayout.addWidget(self.inpainter_panel)

        self.inpaint_layout.addWidget(self.inpainter_panel.module_combobox)

        super().showEvent(e)



    def hideEvent(self, e) -> None:

        self.vlayout.removeWidget(self.inpainter_panel)

        self.inpainter_panel.needInpaintChecker.setVisible(True)

        self.inpaint_layout.removeWidget(self.inpainter_panel.module_combobox)

        return super().hideEvent(e)



    def get_maskseg_method(self):