diff options
Diffstat (limited to 'examples/widgets/painting')
5 files changed, 34 insertions, 32 deletions
diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.py b/examples/widgets/painting/basicdrawing/basicdrawing.py index c1f2a5b0c..858a8cd9f 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.py +++ b/examples/widgets/painting/basicdrawing/basicdrawing.py @@ -6,11 +6,12 @@ from PySide6.QtCore import QPoint, QRect, QSize, Qt, qVersion from PySide6.QtGui import (QBrush, QConicalGradient, QLinearGradient, QPainter, - QPainterPath, QPalette, QPen, QPixmap, QPolygon, QRadialGradient) + QPainterPath, QPalette, QPen, QPixmap, QPolygon, + QRadialGradient) from PySide6.QtWidgets import (QApplication, QCheckBox, QComboBox, QGridLayout, - QLabel, QSpinBox, QWidget) + QLabel, QSpinBox, QWidget) -import basicdrawing_rc +import basicdrawing_rc # noqa: F401 class RenderArea(QWidget): @@ -190,12 +191,9 @@ class Window(QWidget): pen_join_label.setBuddy(self._pen_join_combo_box) self._brush_style_combo_box = QComboBox() - self._brush_style_combo_box.addItem("Linear Gradient", - Qt.LinearGradientPattern) - self._brush_style_combo_box.addItem("Radial Gradient", - Qt.RadialGradientPattern) - self._brush_style_combo_box.addItem("Conical Gradient", - Qt.ConicalGradientPattern) + self._brush_style_combo_box.addItem("Linear Gradient", Qt.LinearGradientPattern) + self._brush_style_combo_box.addItem("Radial Gradient", Qt.RadialGradientPattern) + self._brush_style_combo_box.addItem("Conical Gradient", Qt.ConicalGradientPattern) self._brush_style_combo_box.addItem("Texture", Qt.TexturePattern) self._brush_style_combo_box.addItem("Solid", Qt.SolidPattern) self._brush_style_combo_box.addItem("Horizontal", Qt.HorPattern) @@ -260,24 +258,23 @@ class Window(QWidget): self.setWindowTitle("Basic Drawing") def shape_changed(self): - shape = self._shape_combo_box.itemData(self._shape_combo_box.currentIndex(), - id_role) + shape = self._shape_combo_box.itemData(self._shape_combo_box.currentIndex(), id_role) self._render_area.set_shape(shape) def pen_changed(self): width = self._pen_width_spin_box.value() style = Qt.PenStyle(self._pen_style_combo_box.itemData( - self._pen_style_combo_box.currentIndex(), id_role)) + self._pen_style_combo_box.currentIndex(), id_role)) cap = Qt.PenCapStyle(self._pen_cap_combo_box.itemData( - self._pen_cap_combo_box.currentIndex(), id_role)) + self._pen_cap_combo_box.currentIndex(), id_role)) join = Qt.PenJoinStyle(self._pen_join_combo_box.itemData( - self._pen_join_combo_box.currentIndex(), id_role)) + self._pen_join_combo_box.currentIndex(), id_role)) self._render_area.set_pen(QPen(Qt.blue, width, style, cap, join)) def brush_changed(self): style = Qt.BrushStyle(self._brush_style_combo_box.itemData( - self._brush_style_combo_box.currentIndex(), id_role)) + self._brush_style_combo_box.currentIndex(), id_role)) if style == Qt.LinearGradientPattern: linear_gradient = QLinearGradient(0, 0, 100, 100) diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pyproject b/examples/widgets/painting/basicdrawing/basicdrawing.pyproject index 9ecbfadcf..976bb9e35 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.pyproject +++ b/examples/widgets/painting/basicdrawing/basicdrawing.pyproject @@ -1,3 +1,3 @@ { - "files": ["basicdrawing_rc.py", "basicdrawing.qrc", "basicdrawing.py"] + "files": ["basicdrawing.qrc", "basicdrawing.py"] } diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.py b/examples/widgets/painting/concentriccircles/concentriccircles.py index 0edc9cb9f..d2c60178f 100644 --- a/examples/widgets/painting/concentriccircles/concentriccircles.py +++ b/examples/widgets/painting/concentriccircles/concentriccircles.py @@ -2,12 +2,13 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -"""PySide6 port of the widgets/painting/concentriccircles example from Qt v5.x, originating from PyQt""" +"""PySide6 port of the widgets/painting/concentriccircles example from Qt v5.x, originating + from PyQt""" from PySide6.QtCore import QRect, QRectF, QSize, Qt, QTimer from PySide6.QtGui import QColor, QPainter, QPalette, QPen from PySide6.QtWidgets import (QApplication, QFrame, QGridLayout, QLabel, - QSizePolicy, QWidget) + QSizePolicy, QWidget) class CircleWidget(QWidget): @@ -52,10 +53,10 @@ class CircleWidget(QWidget): if self._float_based: painter.drawEllipse(QRectF(-diameter / 2.0, - -diameter / 2.0, diameter, diameter)) + -diameter / 2.0, diameter, diameter)) else: painter.drawEllipse(QRect(-diameter / 2, - -diameter / 2, diameter, diameter)) + -diameter / 2, diameter, diameter)) class Window(QWidget): diff --git a/examples/widgets/painting/painter/painter.py b/examples/widgets/painting/painter/painter.py index 49036ae00..2ca078ad9 100644 --- a/examples/widgets/painting/painter/painter.py +++ b/examples/widgets/painting/painter/painter.py @@ -9,7 +9,7 @@ from PySide6.QtWidgets import ( QStyle, QColorDialog, ) -from PySide6.QtCore import QPoint, Qt, QDir, Slot, QStandardPaths +from PySide6.QtCore import Qt, Slot, QStandardPaths from PySide6.QtGui import ( QMouseEvent, QPaintEvent, @@ -116,15 +116,17 @@ class MainWindow(QMainWindow): self.bar = self.addToolBar("Menu") self.bar.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) self._save_action = self.bar.addAction( - qApp.style().standardIcon(QStyle.SP_DialogSaveButton), "Save", self.on_save + qApp.style().standardIcon(QStyle.SP_DialogSaveButton), # noqa: F821 + "Save", self.on_save ) self._save_action.setShortcut(QKeySequence.Save) self._open_action = self.bar.addAction( - qApp.style().standardIcon(QStyle.SP_DialogOpenButton), "Open", self.on_open + qApp.style().standardIcon(QStyle.SP_DialogOpenButton), # noqa: F821 + "Open", self.on_open ) self._open_action.setShortcut(QKeySequence.Open) self.bar.addAction( - qApp.style().standardIcon(QStyle.SP_DialogResetButton), + qApp.style().standardIcon(QStyle.SP_DialogResetButton), # noqa: F821 "Clear", self.painter_widget.clear, ) @@ -136,7 +138,8 @@ class MainWindow(QMainWindow): self.setCentralWidget(self.painter_widget) - self.set_color(Qt.black) + self.color = Qt.black + self.set_color(self.color) self.mime_type_filters = ["image/png", "image/jpeg"] @@ -175,19 +178,21 @@ class MainWindow(QMainWindow): @Slot() def on_color_clicked(self): - color = QColorDialog.getColor(Qt.black, self) + color = QColorDialog.getColor(self.color, self) + if color: self.set_color(color) def set_color(self, color: QColor = Qt.black): + self.color = color # Create color icon pix_icon = QPixmap(32, 32) - pix_icon.fill(color) + pix_icon.fill(self.color) self.color_action.setIcon(QIcon(pix_icon)) - self.painter_widget.pen.setColor(color) - self.color_action.setText(QColor(color).name()) + self.painter_widget.pen.setColor(self.color) + self.color_action.setText(QColor(self.color).name()) if __name__ == "__main__": diff --git a/examples/widgets/painting/plot/plot.py b/examples/widgets/painting/plot/plot.py index 9d0dd016b..fd7ff9937 100644 --- a/examples/widgets/painting/plot/plot.py +++ b/examples/widgets/painting/plot/plot.py @@ -5,9 +5,8 @@ import math import sys from PySide6.QtWidgets import QWidget, QApplication -from PySide6.QtCore import QPoint, QRect, QTimer, Qt, Slot -from PySide6.QtGui import (QColor, QPainter, QPaintEvent, QPen, QPointList, - QTransform) +from PySide6.QtCore import QPoint, QRect, QTimer, Qt +from PySide6.QtGui import QPainter, QPointList WIDTH = 680 |