From df43156bb35a442c4988631e1c2b0bd0fc11e618 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 29 Apr 2021 10:09:33 +0200 Subject: Examples: Fix some space-related flake warnings Task-number: PYSIDE-1112 Change-Id: Ib8991199e4822673d6a25cba0023dbe3b03f5938 Reviewed-by: Cristian Maureira-Fredes --- .../widgets/animation/animatedtiles/animatedtiles.py | 2 +- examples/widgets/animation/easing/easing.py | 2 +- examples/widgets/dialogs/findfiles/findfiles.py | 2 +- .../widgets/dialogs/standarddialogs/standarddialogs.py | 10 +++++----- .../widgets/draganddrop/draggabletext/draggabletext.py | 4 ++-- .../widgets/graphicsview/diagramscene/diagramscene.py | 5 ++--- .../graphicsview/dragdroprobot/dragdroprobot.py | 4 ++-- .../widgets/graphicsview/elasticnodes/elasticnodes.py | 1 - .../widgets/itemviews/addressbook/adddialogwidget.py | 1 + .../widgets/itemviews/addressbook/addresswidget.py | 2 +- .../widgets/itemviews/addressbook/newaddresstab.py | 1 + examples/widgets/itemviews/addressbook/tablemodel.py | 5 +++-- examples/widgets/itemviews/fetchmore/fetchmore.py | 2 +- .../widgets/itemviews/stardelegate/stardelegate.py | 1 + examples/widgets/itemviews/stardelegate/stareditor.py | 1 + .../widgets/layouts/dynamiclayouts/dynamiclayouts.py | 6 +++--- .../widgets/mainwindows/application/application.py | 1 + examples/widgets/mainwindows/mdi/mdi.py | 2 +- examples/widgets/painting/basicdrawing/basicdrawing.py | 1 + .../widgets/painting/basicdrawing/basicdrawing_rc.py | 1 + .../widgets/state-machine/eventtrans/eventtrans.py | 1 + .../widgets/state-machine/factstates/factstates.py | 13 +++++++++++++ examples/widgets/state-machine/pingpong/pingpong.py | 18 ++++++++++++++---- examples/widgets/state-machine/rogue/rogue.py | 10 ++++++++++ .../widgets/state-machine/trafficlight/trafficlight.py | 9 +++++++++ examples/widgets/tetrix/tetrix.py | 16 ++++++++-------- examples/widgets/tutorials/addressbook/part4.py | 2 +- examples/widgets/tutorials/addressbook/part5.py | 2 +- examples/widgets/tutorials/addressbook/part6.py | 6 +++--- examples/widgets/tutorials/addressbook/part7.py | 6 +++--- 30 files changed, 93 insertions(+), 44 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.py b/examples/widgets/animation/animatedtiles/animatedtiles.py index d9198c89a..5b93730fd 100644 --- a/examples/widgets/animation/animatedtiles/animatedtiles.py +++ b/examples/widgets/animation/animatedtiles/animatedtiles.py @@ -205,7 +205,7 @@ if __name__ == '__main__': # Figure 8. figure_8state.assignProperty(item, 'pos', QPointF(math.sin((i / 63.0) * 6.28) * 250, - math.sin(((i * 2)/63.0) * 6.28) * 250)) + math.sin(((i * 2) / 63.0) * 6.28) * 250)) # Random. random_state.assignProperty(item, 'pos', diff --git a/examples/widgets/animation/easing/easing.py b/examples/widgets/animation/easing/easing.py index 83d2e3666..6450730d0 100644 --- a/examples/widgets/animation/easing/easing.py +++ b/examples/widgets/animation/easing/easing.py @@ -181,7 +181,7 @@ class Window(QWidget): painter.setPen(QColor(0, 0, 255, 64)) x_axis = self._iconSize.height() / 1.5 y_axis = self._iconSize.width() / 3.0 - painter.drawLine(0, x_axis, self._iconSize.width(), x_axis) + painter.drawLine(0, x_axis, self._iconSize.width(), x_axis) painter.drawLine(y_axis, 0, y_axis, self._iconSize.height()) curve_scale = self._iconSize.height() / 2.0 diff --git a/examples/widgets/dialogs/findfiles/findfiles.py b/examples/widgets/dialogs/findfiles/findfiles.py index 779954edc..d5746d1a4 100644 --- a/examples/widgets/dialogs/findfiles/findfiles.py +++ b/examples/widgets/dialogs/findfiles/findfiles.py @@ -45,7 +45,7 @@ import sys from PySide6.QtCore import (QCoreApplication, QDir, QFile, QFileInfo, - QIODevice, QTextStream, QUrl, Qt) + QIODevice, QTextStream, QUrl, Qt) from PySide6.QtGui import QDesktopServices from PySide6.QtWidgets import (QAbstractItemView, QApplication, QComboBox, QDialog, QFileDialog, QGridLayout, QHBoxLayout, diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.py b/examples/widgets/dialogs/standarddialogs/standarddialogs.py index 934714237..6177238e3 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.py +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.py @@ -70,7 +70,7 @@ class DialogOptionsWidget(QGroupBox): def add_checkbox(self, text, value): checkbox = QCheckBox(text) - self._layout.addWidget(checkbox); + self._layout.addWidget(checkbox) self._mapping[checkbox] = value @@ -132,7 +132,7 @@ class Dialog(QDialog): QFontDialog.MonospacedFonts) self._font_options.add_checkbox("Show proportional fonts", QFontDialog.ProportionalFonts) - self._font_options.add_checkbox("No buttons", QFontDialog.NoButtons); + self._font_options.add_checkbox("No buttons", QFontDialog.NoButtons) self._directory_label = QLabel() self._directory_label.setFrameStyle(frame_style) @@ -158,7 +158,7 @@ class Dialog(QDialog): self._file_options.add_checkbox("Do not resolve symlinks", QFileDialog.DontResolveSymlinks) self._file_options.add_checkbox("Do not confirm overwrite", - QFileDialog.DontConfirmOverwrite); + QFileDialog.DontConfirmOverwrite) self._file_options.add_checkbox("Readonly", QFileDialog.ReadOnly) self._file_options.add_checkbox("Hide name filter details", QFileDialog.HideNameFilterDetails) @@ -230,7 +230,7 @@ class Dialog(QDialog): spacer = QSpacerItem(0, 0, QSizePolicy.Ignored, QSizePolicy.MinimumExpanding) layout.addItem(spacer, 1, 0) layout.addWidget(self._color_options, 2, 0, 1, 2) - toolbox.addItem(page, "Color Dialog"); + toolbox.addItem(page, "Color Dialog") page = QWidget() layout = QGridLayout(page) @@ -320,7 +320,7 @@ class Dialog(QDialog): def set_font(self): options_value = self._font_options.value() - options = QFontDialog.FontDialogOptions(options_value) + options = QFontDialog.FontDialogOptions(options_value) description = self._font_label.text() default_font = QFont() diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.py b/examples/widgets/draganddrop/draggabletext/draggabletext.py index efe35e8ce..2c54fe97b 100644 --- a/examples/widgets/draganddrop/draggabletext/draggabletext.py +++ b/examples/widgets/draganddrop/draggabletext/draggabletext.py @@ -127,8 +127,8 @@ class DragWidget(QWidget): hot_spot_pos = mime.data('application/x-hotspot').split(' ') if len(hot_spot_pos) == 2: - hot_spot.setX(hot_spot_pos[0].toInt()[0]) - hot_spot.setY(hot_spot_pos[1].toInt()[0]) + hot_spot.setX(hot_spot_pos[0].toInt()[0]) + hot_spot.setY(hot_spot_pos[1].toInt()[0]) for piece in pieces: new_label = DragLabel(piece, self) diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py index 492a9d25b..92c75effc 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.py +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py @@ -131,7 +131,6 @@ class Arrow(QGraphicsLineItem): if line.dy() >= 0: angle = (math.pi * 2.0) - angle - arrow_head1 = QPointF(math.sin(angle + math.pi / 3.0) * arrow_size, math.cos(angle + math.pi / 3) * arrow_size) arrow_p1 = line.p1() + arrow_head1 @@ -150,7 +149,7 @@ class Arrow(QGraphicsLineItem): my_line = QLineF(line) my_line.translate(0, 4.0) painter.drawLine(my_line) - my_line.translate(0,-8.0) + my_line.translate(0, -8.0) painter.drawLine(my_line) @@ -259,7 +258,7 @@ class DiagramItem(QGraphicsPolygonItem): class DiagramScene(QGraphicsScene): - InsertItem, InsertLine, InsertText, MoveItem = range(4) + InsertItem, InsertLine, InsertText, MoveItem = range(4) item_inserted = Signal(DiagramItem) diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py index 8fbd6c79c..77dd4d51f 100644 --- a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py +++ b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.py @@ -103,7 +103,7 @@ class ColorItem(QGraphicsItem): if ColorItem.n > 2 and random(3) == 0: image = QImage(':/images/head.png') mime.setImageData(image) - drag.setPixmap(QPixmap.fromImage(image).scaled(30,40)) + drag.setPixmap(QPixmap.fromImage(image).scaled(30, 40)) drag.setHotSpot(QPoint(15, 30)) else: mime.setColorData(self.color) @@ -184,7 +184,7 @@ class RobotHead(RobotPart): painter.drawArc(-6, -2 - 20, 12, 15, 190 * 16, 160 * 16) else: painter.scale(.2272, .2824) - painter.drawPixmap(QPointF(-15*4.4, -50*3.54), self.pixmap) + painter.drawPixmap(QPointF(-15 * 4.4, -50 * 3.54), self.pixmap) class RobotTorso(RobotPart): diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py index 549a27259..b495a8f44 100644 --- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py +++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py @@ -359,7 +359,6 @@ class GraphWidget(QGraphicsView): else: QGraphicsView.keyPressEvent(self, event) - def timerEvent(self, event): nodes = [item for item in self.scene().items() if isinstance(item, Node)] diff --git a/examples/widgets/itemviews/addressbook/adddialogwidget.py b/examples/widgets/itemviews/addressbook/adddialogwidget.py index bf2dd679d..302275088 100644 --- a/examples/widgets/itemviews/addressbook/adddialogwidget.py +++ b/examples/widgets/itemviews/addressbook/adddialogwidget.py @@ -44,6 +44,7 @@ from PySide6.QtCore import Qt from PySide6.QtWidgets import (QDialog, QLabel, QTextEdit, QLineEdit, QDialogButtonBox, QGridLayout, QVBoxLayout) + class AddDialogWidget(QDialog): """ A dialog to add a new address to the addressbook. """ diff --git a/examples/widgets/itemviews/addressbook/addresswidget.py b/examples/widgets/itemviews/addressbook/addresswidget.py index d16f70f42..111e9d1cd 100644 --- a/examples/widgets/itemviews/addressbook/addresswidget.py +++ b/examples/widgets/itemviews/addressbook/addresswidget.py @@ -198,7 +198,7 @@ class AddressWidget(QTabWidget): assert re.isValid() re.setPatternOptions(QRegularExpression.CaseInsensitiveOption) proxy_model.setFilterRegularExpression(re) - proxy_model.setFilterKeyColumn(0) # Filter on the "name" column + proxy_model.setFilterKeyColumn(0) # Filter on the "name" column proxy_model.sort(0, Qt.AscendingOrder) # This prevents an application crash (see: http://www.qtcentre.org/threads/58874-QListView-SelectionModel-selectionChanged-Crash) diff --git a/examples/widgets/itemviews/addressbook/newaddresstab.py b/examples/widgets/itemviews/addressbook/newaddresstab.py index 8a2a0ceb6..d4e981a01 100644 --- a/examples/widgets/itemviews/addressbook/newaddresstab.py +++ b/examples/widgets/itemviews/addressbook/newaddresstab.py @@ -45,6 +45,7 @@ from PySide6.QtWidgets import (QWidget, QLabel, QPushButton, QVBoxLayout) from adddialogwidget import AddDialogWidget + class NewAddressTab(QWidget): """ An extra tab that prompts the user to add new contacts. To be displayed only when there are no contacts in the model. diff --git a/examples/widgets/itemviews/addressbook/tablemodel.py b/examples/widgets/itemviews/addressbook/tablemodel.py index ec8e3e9e4..fc1a65e1c 100644 --- a/examples/widgets/itemviews/addressbook/tablemodel.py +++ b/examples/widgets/itemviews/addressbook/tablemodel.py @@ -42,6 +42,7 @@ from PySide6.QtCore import (Qt, QAbstractTableModel, QModelIndex) + class TableModel(QAbstractTableModel): def __init__(self, addresses=None, parent=None): @@ -100,7 +101,7 @@ class TableModel(QAbstractTableModel): self.beginInsertRows(QModelIndex(), position, position + rows - 1) for row in range(rows): - self.addresses.insert(position + row, {"name":"", "address":""}) + self.addresses.insert(position + row, {"name": "", "address": ""}) self.endInsertRows() return True @@ -109,7 +110,7 @@ class TableModel(QAbstractTableModel): """ Remove a row from the model. """ self.beginRemoveRows(QModelIndex(), position, position + rows - 1) - del self.addresses[position:position+rows] + del self.addresses[position:position + rows] self.endRemoveRows() return True diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.py b/examples/widgets/itemviews/fetchmore/fetchmore.py index 1ee4d8635..a090a8a89 100644 --- a/examples/widgets/itemviews/fetchmore/fetchmore.py +++ b/examples/widgets/itemviews/fetchmore/fetchmore.py @@ -154,7 +154,7 @@ class Window(QWidget): @Slot(str, int, int) def update_log(self, path, start, number, total): native_path = QDir.toNativeSeparators(path) - last = start + number -1 + last = start + number - 1 entry = f'{start}..{last}/{total} items from "{native_path}" added.' self._log_viewer.appendPlainText(entry) diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.py b/examples/widgets/itemviews/stardelegate/stardelegate.py index e4c4bae12..e8ae0e252 100644 --- a/examples/widgets/itemviews/stardelegate/stardelegate.py +++ b/examples/widgets/itemviews/stardelegate/stardelegate.py @@ -46,6 +46,7 @@ from PySide6.QtWidgets import QStyledItemDelegate, QStyle from starrating import StarRating from stareditor import StarEditor + class StarDelegate(QStyledItemDelegate): """ A subclass of QStyledItemDelegate that allows us to render our pretty star ratings. diff --git a/examples/widgets/itemviews/stardelegate/stareditor.py b/examples/widgets/itemviews/stardelegate/stareditor.py index 226552cc0..8431f4a38 100644 --- a/examples/widgets/itemviews/stardelegate/stareditor.py +++ b/examples/widgets/itemviews/stardelegate/stareditor.py @@ -47,6 +47,7 @@ from PySide6.QtCore import Signal from starrating import StarRating + class StarEditor(QWidget): """ The custom editor for editing StarRatings. """ diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py index fc57e011f..5c4abeb3e 100644 --- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py +++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.py @@ -48,6 +48,7 @@ from PySide6.QtWidgets import (QApplication, QDialog, QLayout, QGridLayout, QProgressBar, QDial, QDialogButtonBox, QComboBox, QLabel) + class Dialog(QDialog): def __init__(self): super().__init__() @@ -79,11 +80,10 @@ class Dialog(QDialog): self._rotable_widgets.append(self._rotable_widgets.pop(0)) - for i in range(count//2): + for i in range(count // 2): self._rotable_layout.addWidget(self._rotable_widgets[count - i - 1], 0, i) self._rotable_layout.addWidget(self._rotable_widgets[i], 1, i) - def buttons_orientation_changed(self, index): self._main_layout.setSizeConstraint(QLayout.SetNoConstraint) self.setMinimumSize(0, 0) @@ -125,7 +125,7 @@ class Dialog(QDialog): count = len(self._rotable_widgets) for i in range(count): self._rotable_widgets[i].valueChanged[int].\ - connect(self._rotable_widgets[(i+1) % count].setValue) + connect(self._rotable_widgets[(i + 1) % count].setValue) self._rotable_layout = QGridLayout() self._rotable_group_box.setLayout(self._rotable_layout) diff --git a/examples/widgets/mainwindows/application/application.py b/examples/widgets/mainwindows/application/application.py index d355a7cb2..dc86b5dd4 100644 --- a/examples/widgets/mainwindows/application/application.py +++ b/examples/widgets/mainwindows/application/application.py @@ -51,6 +51,7 @@ from PySide6.QtWidgets import (QApplication, QFileDialog, QMainWindow, import application_rc + class MainWindow(QMainWindow): def __init__(self): super().__init__() diff --git a/examples/widgets/mainwindows/mdi/mdi.py b/examples/widgets/mainwindows/mdi/mdi.py index 7027d32cc..a4846442e 100644 --- a/examples/widgets/mainwindows/mdi/mdi.py +++ b/examples/widgets/mainwindows/mdi/mdi.py @@ -144,7 +144,7 @@ class MdiChild(QTextEdit): def maybe_save(self): if self.document().isModified(): f = self.user_friendly_current_file() - message = f"'{f}' has been modified.\nDo you want to save your changes?" + message = f"'{f}' has been modified.\nDo you want to save your changes?" ret = QMessageBox.warning(self, "MDI", message, QMessageBox.Save | QMessageBox.Discard | QMessageBox.Cancel) diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.py b/examples/widgets/painting/basicdrawing/basicdrawing.py index e08ce061d..998ccd9c1 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.py +++ b/examples/widgets/painting/basicdrawing/basicdrawing.py @@ -168,6 +168,7 @@ class RenderArea(QWidget): id_role = Qt.UserRole + class Window(QWidget): def __init__(self): super().__init__() diff --git a/examples/widgets/painting/basicdrawing/basicdrawing_rc.py b/examples/widgets/painting/basicdrawing/basicdrawing_rc.py index 19e2b3b7a..e7f9584de 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing_rc.py +++ b/examples/widgets/painting/basicdrawing/basicdrawing_rc.py @@ -132,4 +132,5 @@ def qInitResources(): def qCleanupResources(): QtCore.qUnregisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data) + qInitResources() diff --git a/examples/widgets/state-machine/eventtrans/eventtrans.py b/examples/widgets/state-machine/eventtrans/eventtrans.py index 8fe67ace8..8ed1ccc9c 100644 --- a/examples/widgets/state-machine/eventtrans/eventtrans.py +++ b/examples/widgets/state-machine/eventtrans/eventtrans.py @@ -86,6 +86,7 @@ class MainWindow(QMainWindow): self.setCentralWidget(button) self.show() + if __name__ == '__main__': import sys diff --git a/examples/widgets/state-machine/factstates/factstates.py b/examples/widgets/state-machine/factstates/factstates.py index 47cf4d841..053e89908 100644 --- a/examples/widgets/state-machine/factstates/factstates.py +++ b/examples/widgets/state-machine/factstates/factstates.py @@ -48,49 +48,62 @@ from PySide6.QtStateMachine import (QFinalState, QSignalTransition, QState, class Factorial(QObject): x_changed = Signal(int) + def __init__(self): super().__init__() self.xval = -1 self.facval = 1 + def get_x(self): return self.xval + def set_x(self, x): if self.xval == x: return self.xval = x self.x_changed.emit(x) x = Property(int, get_x, set_x) + def get_fact(self): return self.facval + def set_fact(self, fac): self.facval = fac + fac = Property(int, get_fact, set_fact) + class FactorialLoopTransition(QSignalTransition): def __init__(self, fact): super().__init__(fact, SIGNAL('x_changed(int)')) self.fact = fact + def eventTest(self, e): if not super(FactorialLoopTransition, self).eventTest(e): return False return e.arguments()[0] > 1 + def onTransition(self, e): x = e.arguments()[0] fac = self.fact.fac self.fact.fac = x * fac self.fact.x = x - 1 + class FactorialDoneTransition(QSignalTransition): def __init__(self, fact): super().__init__(fact, SIGNAL('x_changed(int)')) self.fact = fact + def eventTest(self, e): if not super(FactorialDoneTransition, self).eventTest(e): return False return e.arguments()[0] <= 1 + def onTransition(self, e): print(self.fact.fac) + if __name__ == '__main__': import sys app = QCoreApplication(sys.argv) diff --git a/examples/widgets/state-machine/pingpong/pingpong.py b/examples/widgets/state-machine/pingpong/pingpong.py index 12de2bb69..ec4d7cfec 100644 --- a/examples/widgets/state-machine/pingpong/pingpong.py +++ b/examples/widgets/state-machine/pingpong/pingpong.py @@ -47,34 +47,44 @@ from PySide6.QtStateMachine import QAbstractTransition, QState, QStateMachine class PingEvent(QEvent): def __init__(self): - super().__init__(QEvent.Type(QEvent.User+2)) + super().__init__(QEvent.Type(QEvent.User + 2)) + + class PongEvent(QEvent): def __init__(self): - super().__init__(QEvent.Type(QEvent.User+3)) + super().__init__(QEvent.Type(QEvent.User + 3)) + class Pinger(QState): def __init__(self, parent): super().__init__(parent) + def onEntry(self, e): self.p = PingEvent() self.machine().postEvent(self.p) print('ping?') + class PongTransition(QAbstractTransition): def eventTest(self, e): - return e.type() == QEvent.User+3 + return e.type() == QEvent.User + 3 + def onTransition(self, e): self.p = PingEvent() machine.postDelayedEvent(self.p, 500) print('ping?') + + class PingTransition(QAbstractTransition): def eventTest(self, e): - return e.type() == QEvent.User+2 + return e.type() == QEvent.User + 2 + def onTransition(self, e): self.p = PongEvent() machine.postDelayedEvent(self.p, 500) print('pong!') + if __name__ == '__main__': import sys app = QCoreApplication(sys.argv) diff --git a/examples/widgets/state-machine/rogue/rogue.py b/examples/widgets/state-machine/rogue/rogue.py index 67caef1f0..5bbc7dabc 100644 --- a/examples/widgets/state-machine/rogue/rogue.py +++ b/examples/widgets/state-machine/rogue/rogue.py @@ -51,6 +51,7 @@ class MovementTransition(QEventTransition): def __init__(self, window): super().__init__(window, QEvent.KeyPress) self.window = window + def eventTest(self, event): if event.type() == QEvent.StateMachineWrapped and \ event.event().type() == QEvent.KeyPress: @@ -58,6 +59,7 @@ class MovementTransition(QEventTransition): return key == Qt.Key_2 or key == Qt.Key_8 or \ key == Qt.Key_6 or key == Qt.Key_4 return False + def onTransition(self, event): key = event.event().key() if key == Qt.Key_4: @@ -69,6 +71,7 @@ class MovementTransition(QEventTransition): if key == Qt.Key_2: self.window.move_player(self.window.down) + class Custom(QState): def __init__(self, parent, mw): super().__init__(parent) @@ -77,6 +80,7 @@ class Custom(QState): def onEntry(self, e): print(self.mw.status) + class MainWindow(QMainWindow): def __init__(self): super().__init__() @@ -98,6 +102,7 @@ class MainWindow(QMainWindow): self.setup_map() self.build_machine() self.show() + def setup_map(self): self.map = [] generator = QRandomGenerator().global_() @@ -150,6 +155,7 @@ class MainWindow(QMainWindow): metrics = QFontMetrics(self.font()) return QSize(metrics.horizontalAdvance('X') * self.width, metrics.height() * (self.height + 1)) + def paintEvent(self, event): metrics = QFontMetrics(self.font()) painter = QPainter(self) @@ -171,6 +177,7 @@ class MainWindow(QMainWindow): painter.drawText(QPoint(x_pos, y_pos), self.map[x][y]) x_pos += font_width painter.drawText(QPoint(self.pX * font_width, (self.pY + 2) * font_height), '@') + def move_player(self, direction): if direction == self.left: if self.map[self.pX - 1][self.pY] != '#': @@ -185,8 +192,10 @@ class MainWindow(QMainWindow): if self.map[self.pX][self.pY + 1] != '#': self.pY += 1 self.repaint() + def get_status(self): return self._status_str + def set_status(self, status): self._status_str = status self.repaint() @@ -198,6 +207,7 @@ class MainWindow(QMainWindow): width = 35 height = 20 + if __name__ == '__main__': import sys app = QApplication(sys.argv) diff --git a/examples/widgets/state-machine/trafficlight/trafficlight.py b/examples/widgets/state-machine/trafficlight/trafficlight.py index e807d7388..3964c4eb8 100644 --- a/examples/widgets/state-machine/trafficlight/trafficlight.py +++ b/examples/widgets/state-machine/trafficlight/trafficlight.py @@ -51,19 +51,24 @@ class LightWidget(QWidget): super().__init__() self.color = color self._on_val = False + def is_on(self): return self._on_val + def set_on(self, on): if self._on_val == on: return self._on_val = on self.update() + @Slot() def turn_off(self): self.set_on(False) + @Slot() def turn_on(self): self.set_on(True) + def paintEvent(self, e): if not self._on_val: return @@ -74,6 +79,7 @@ class LightWidget(QWidget): on = Property(bool, is_on, set_on) + class TrafficLightWidget(QWidget): def __init__(self): super().__init__() @@ -89,6 +95,7 @@ class TrafficLightWidget(QWidget): self.setPalette(pal) self.setAutoFillBackground(True) + def create_light_state(light, duration, parent=None): light_state = QState(parent) timer = QTimer(light_state) @@ -103,6 +110,7 @@ def create_light_state(light, duration, parent=None): light_state.setInitialState(timing) return light_state + class TrafficLight(QWidget): def __init__(self): super().__init__() @@ -132,6 +140,7 @@ class TrafficLight(QWidget): machine.setInitialState(red_going_yellow) machine.start() + if __name__ == '__main__': import sys app = QApplication(sys.argv) diff --git a/examples/widgets/tetrix/tetrix.py b/examples/widgets/tetrix/tetrix.py index 6103afd18..37b0ad36a 100644 --- a/examples/widgets/tetrix/tetrix.py +++ b/examples/widgets/tetrix/tetrix.py @@ -53,14 +53,14 @@ from PySide6.QtWidgets import (QApplication, QFrame, QGridLayout, QLabel, class Piece(IntEnum): - NoShape = 0 - ZShape = 1 - SShape = 2 - LineShape = 3 - TShape = 4 - SquareShape = 5 - LShape = 6 - MirroredLShape = 7 + NoShape = 0 + ZShape = 1 + SShape = 2 + LineShape = 3 + TShape = 4 + SquareShape = 5 + LShape = 6 + MirroredLShape = 7 class TetrixWindow(QWidget): diff --git a/examples/widgets/tutorials/addressbook/part4.py b/examples/widgets/tutorials/addressbook/part4.py index b28b1953c..013f5610d 100644 --- a/examples/widgets/tutorials/addressbook/part4.py +++ b/examples/widgets/tutorials/addressbook/part4.py @@ -288,7 +288,7 @@ class AddressBook(QWidget): self._edit_button.setEnabled(number >= 1) self._remove_button.setEnabled(number >= 1) self._next_button.setEnabled(number > 1) - self._previous_button.setEnabled(number >1 ) + self._previous_button.setEnabled(number > 1) self._submit_button.hide() self._cancel_button.hide() diff --git a/examples/widgets/tutorials/addressbook/part5.py b/examples/widgets/tutorials/addressbook/part5.py index 5d8918870..d43c2fd27 100644 --- a/examples/widgets/tutorials/addressbook/part5.py +++ b/examples/widgets/tutorials/addressbook/part5.py @@ -312,7 +312,7 @@ class AddressBook(QWidget): self._remove_button.setEnabled(number >= 1) self._find_button.setEnabled(number > 2) self._next_button.setEnabled(number > 1) - self._previous_button.setEnabled(number >1 ) + self._previous_button.setEnabled(number > 1) self._submit_button.hide() self._cancel_button.hide() diff --git a/examples/widgets/tutorials/addressbook/part6.py b/examples/widgets/tutorials/addressbook/part6.py index aae863ead..f96a55e17 100644 --- a/examples/widgets/tutorials/addressbook/part6.py +++ b/examples/widgets/tutorials/addressbook/part6.py @@ -325,7 +325,7 @@ class AddressBook(QWidget): self._remove_button.setEnabled(number >= 1) self._find_button.setEnabled(number > 2) self._next_button.setEnabled(number > 1) - self._previous_button.setEnabled(number >1 ) + self._previous_button.setEnabled(number > 1) self._submit_button.hide() self._cancel_button.hide() @@ -334,7 +334,7 @@ class AddressBook(QWidget): self._save_button.setEnabled(number >= 1) def save_to_file(self): - fileName,_ = QFileDialog.getSaveFileName(self, + fileName, _ = QFileDialog.getSaveFileName(self, "Save Address Book", '', "Address Book (*.abk);;All Files (*)") @@ -352,7 +352,7 @@ class AddressBook(QWidget): out_file.close() def load_from_file(self): - fileName,_ = QFileDialog.getOpenFileName(self, + fileName, _ = QFileDialog.getOpenFileName(self, "Open Address Book", '', "Address Book (*.abk);;All Files (*)") diff --git a/examples/widgets/tutorials/addressbook/part7.py b/examples/widgets/tutorials/addressbook/part7.py index 89f5b3467..a926d62eb 100644 --- a/examples/widgets/tutorials/addressbook/part7.py +++ b/examples/widgets/tutorials/addressbook/part7.py @@ -332,7 +332,7 @@ class AddressBook(QWidget): self._remove_button.setEnabled(number >= 1) self._find_button.setEnabled(number > 2) self._next_button.setEnabled(number > 1) - self._previous_button.setEnabled(number >1 ) + self._previous_button.setEnabled(number > 1) self._submit_button.hide() self._cancel_button.hide() @@ -343,7 +343,7 @@ class AddressBook(QWidget): self._save_button.setEnabled(number >= 1) def save_to_file(self): - fileName,_ = QFileDialog.getSaveFileName(self, + fileName, _ = QFileDialog.getSaveFileName(self, "Save Address Book", '', "Address Book (*.abk);;All Files (*)") @@ -361,7 +361,7 @@ class AddressBook(QWidget): out_file.close() def load_from_file(self): - fileName,_ = QFileDialog.getOpenFileName(self, + fileName, _ = QFileDialog.getOpenFileName(self, "Open Address Book", '', "Address Book (*.abk);;All Files (*)") -- cgit v1.2.3