Unverified Commit f6e39e3a authored by dmMaze's avatar dmMaze Committed by GitHub
Browse files

Merge pull request #65 from alicewish/master 

fix pyqt float error
parents 6243c081 02880017

ballontranslator/ui/dlconfig_parse_widgets.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class ParamNameLabel(QLabel): 
        labelwidth = 120

        fm = QFontMetricsF(font)

        fmw = fm.boundingRect(param_name).width()

        labelwidth = max(fmw, labelwidth)

        labelwidth = int(max(fmw, labelwidth))

        self.setFixedWidth(labelwidth)

        self.setText(param_name)

ballontranslator/ui/drawingpanel.py

+6 −6
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ class DrawingPanel(Widget): 
        dl_manager.inpaint_thread.exception_occurred.connect(self.on_inpaint_failed)



    def setInpaintToolWidth(self, width):

        self.inpaint_pen.setWidth(width)

        self.inpaint_pen.setWidthF(width)

        if self.isVisible():

            self.setInpaintCursor()
@@ -452,11 +452,11 @@ class DrawingPanel(Widget): 
    def set_config(self, config: DrawPanelConfig):

        self.setPenToolWidth(config.pentool_width)

        self.setPenToolColor(config.pentool_color)

        self.penConfigPanel.thicknessSlider.setValue(config.pentool_width)

        self.penConfigPanel.thicknessSlider.setValue(int(config.pentool_width))

        self.penConfigPanel.shapeCombobox.setCurrentIndex(config.pentool_shape)

        

        self.setInpaintToolWidth(config.inpainter_width)

        self.inpaintConfigPanel.thicknessSlider.setValue(config.inpainter_width)

        self.inpaintConfigPanel.thicknessSlider.setValue(int(config.inpainter_width))

        self.inpaintConfigPanel.shapeCombobox.setCurrentIndex(config.inpainter_shape)

        

        self.rectPanel.dilate_slider.setValue(config.recttool_dilate_ksize)
@@ -541,7 +541,7 @@ class DrawingPanel(Widget): 
                new_val = max(val+1, new_val)

            else:

                new_val = min(val-1, new_val)

            self.penConfigPanel.thicknessSlider.setValue(new_val)

            self.penConfigPanel.thicknessSlider.setValue(int(new_val))

            self.setPenToolWidth(self.penConfigPanel.thicknessSlider.value())



        elif self.currentTool == self.inpaintTool:
@@ -551,7 +551,7 @@ class DrawingPanel(Widget): 
                new_val = max(val+1, new_val)

            else:

                new_val = min(val-1, new_val)

            self.inpaintConfigPanel.thicknessSlider.setValue(new_val)

            self.inpaintConfigPanel.thicknessSlider.setValue(int(new_val))

            self.setInpaintToolWidth(self.inpaintConfigPanel.thicknessSlider.value())



    def showEvent(self, event) -> None:
@@ -699,7 +699,7 @@ class DrawingPanel(Widget): 
        self.scale_circle.setRect(0, 0, radius, radius)



    def on_end_scale_tool(self):

        circle_size = self.scale_circle.rect().width() / self.canvas.scale_factor

        circle_size = int(self.scale_circle.rect().width() / self.canvas.scale_factor)

        self.scale_tool_pos = None

        self.canvas.removeItem(self.scale_circle)

ballontranslator/ui/fontformatpanel.py

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ class FontFormatPanel(Widget): 
        self.letterSpacingBox = SizeComboBox([0, 10], self)

        self.letterSpacingBox.addItems(["0.0"])

        self.letterSpacingBox.setToolTip(self.tr("Change letter spacing"))

        self.letterSpacingBox.setMinimumWidth(self.letterSpacingBox.height() * 2.5)

        self.letterSpacingBox.setMinimumWidth(int(self.letterSpacingBox.height() * 2.5))

        self.letterSpacingBox.apply_change.connect(self.update_letter_spacing)

        self.letterSpacingBox.editTextChanged.connect(self.onLetterSpacingEditorChanged)

ballontranslator/ui/mainwindow.py

+2 −2
Original line number Diff line number Diff line
@@ -183,8 +183,8 @@ class MainWindow(FramelessWindow): 


    def setupConfig(self):



        self.bottomBar.originalSlider.setValue(self.config.original_transparency * 100)

        self.drawingPanel.maskTransperancySlider.setValue(self.config.mask_transparency * 100)

        self.bottomBar.originalSlider.setValue(int(self.config.original_transparency * 100))

        self.drawingPanel.maskTransperancySlider.setValue(int(self.config.mask_transparency * 100))

        self.leftBar.initRecentProjMenu(self.config.recent_proj_list)

        self.leftBar.save_config.connect(self.save_config)

        self.leftBar.imgTransChecker.setChecked(True)

ballontranslator/ui/mainwindowbars.py

+2 −2
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ class LeftBar(Widget): 
        vlayout.addItem(QSpacerItem(0, 0, QSizePolicy.Minimum, QSizePolicy.Expanding))

        vlayout.addWidget(self.configChecker)

        vlayout.addWidget(self.runImgtransBtn)

        vlayout.setContentsMargins(padding, 0, padding, LEFTBTN_WIDTH / 2)

        vlayout.setContentsMargins(padding, 0, padding, int(LEFTBTN_WIDTH / 2))

        vlayout.setAlignment(Qt.AlignmentFlag.AlignCenter)

        vlayout.setSpacing(LEFTBTN_WIDTH / 2)

        vlayout.setSpacing(int(LEFTBTN_WIDTH / 2))

        self.setGeometry(0, 0, 300, 500)

        self.setMouseTracking(True)