diff options
Diffstat (limited to 'examples/widgets/tutorials/cannon/t8.py')
| -rw-r--r-- | examples/widgets/tutorials/cannon/t8.py | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/examples/widgets/tutorials/cannon/t8.py b/examples/widgets/tutorials/cannon/t8.py index 32aaaddbe..20763741f 100644 --- a/examples/widgets/tutorials/cannon/t8.py +++ b/examples/widgets/tutorials/cannon/t8.py @@ -1,7 +1,7 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt for Python examples of the Qt Toolkit. @@ -43,41 +43,44 @@ import sys -from PySide6 import QtCore, QtGui, QtWidgets +from PySide6.QtCore import Signal, Slot, Qt +from PySide6.QtGui import QColor, QFont, QPainter, QPalette +from PySide6.QtWidgets import (QApplication, QGridLayout, QLCDNumber, + QPushButton, QSlider, QVBoxLayout, QWidget) + + +class LCDRange(QWidget): + + value_changed = Signal(int) -class LCDRange(QtWidgets.QWidget): - value_changed = QtCore.Signal(int) def __init__(self, parent=None): - QtWidgets.QWidget.__init__(self, parent) + super().__init__(parent) - lcd = QtWidgets.QLCDNumber(2) - self.slider = QtWidgets.QSlider(QtCore.Qt.Horizontal) + lcd = QLCDNumber(2) + self.slider = QSlider(Qt.Horizontal) self.slider.setRange(0, 99) self.slider.setValue(0) - self.connect(self.slider, QtCore.SIGNAL("valueChanged(int)"), - lcd, QtCore.SLOT("display(int)")) - self.connect(self.slider, QtCore.SIGNAL("valueChanged(int)"), - self, QtCore.SIGNAL("valueChanged(int)")) + self.slider.valueChanged.connect(lcd.display) + self.slider.valueChanged.connect(self.value_changed) - layout = QtWidgets.QVBoxLayout() + layout = QVBoxLayout(self) layout.addWidget(lcd) layout.addWidget(self.slider) - self.setLayout(layout) self.setFocusProxy(self.slider) def value(self): return self.slider.value() - @QtCore.Slot(int) + @Slot(int) def set_value(self, value): self.slider.setValue(value) def set_range(self, minValue, maxValue): if minValue < 0 or maxValue > 99 or minValue > maxValue: - QtCore.qWarning("LCDRange.setRange({minValue}, {maxValue})\n" + qWarning("LCDRange.setRange({minValue}, {maxValue})\n" "\tRange must be 0..99\n" "\tand minValue must not be greater than maxValue") return @@ -85,19 +88,21 @@ class LCDRange(QtWidgets.QWidget): self.slider.setRange(minValue, maxValue) -class CannonField(QtWidgets.QWidget): - angle_changed = QtCore.Signal(int) +class CannonField(QWidget): + + angle_changed = Signal(int) + def __init__(self, parent=None): - QtWidgets.QWidget.__init__(self, parent) + super().__init__(parent) self._current_angle = 45 - self.setPalette(QtGui.QPalette(QtGui.QColor(250, 250, 200))) + self.setPalette(QPalette(QColor(250, 250, 200))) self.setAutoFillBackground(True) def angle(self): return self._current_angle - @QtCore.Slot(int) + @Slot(int) def set_angle(self, angle): if angle < 5: angle = 5 @@ -107,46 +112,43 @@ class CannonField(QtWidgets.QWidget): return self._current_angle = angle self.update() - self.emit(QtCore.SIGNAL("angleChanged(int)"), self._current_angle) + self.angle_changed.emit(self._current_angle) def paintEvent(self, event): - painter = QtGui.QPainter(self) + painter = QPainter(self) painter.drawText(200, 200, f"Angle = {self._current_angle}") -class MyWidget(QtWidgets.QWidget): +class MyWidget(QWidget): def __init__(self, parent=None): - QtWidgets.QWidget.__init__(self, parent) + super().__init__(parent) - quit = QtWidgets.QPushButton("Quit") - quit.setFont(QtGui.QFont("Times", 18, QtGui.QFont.Bold)) + quit = QPushButton("Quit") + quit.setFont(QFont("Times", 18, QFont.Bold)) - self.connect(quit, QtCore.SIGNAL("clicked()"), - qApp, QtCore.SLOT("quit()")) + quit.clicked.connect(qApp.quit) angle = LCDRange() angle.set_range(5, 70) cannon_field = CannonField() - self.connect(angle, QtCore.SIGNAL("valueChanged(int)"), - cannon_field.set_angle) - self.connect(cannon_field, QtCore.SIGNAL("angleChanged(int)"), - angle.set_value) + angle.value_changed.connect(cannon_field.set_angle) + cannon_field.angle_changed.connect(angle.set_value) - grid_layout = QtWidgets.QGridLayout() + grid_layout = QGridLayout(self) grid_layout.addWidget(quit, 0, 0) grid_layout.addWidget(angle, 1, 0) grid_layout.addWidget(cannon_field, 1, 1, 2, 1) grid_layout.setColumnStretch(1, 10) - self.setLayout(grid_layout) angle.set_value(60) angle.setFocus() -app = QtWidgets.QApplication(sys.argv) -widget = MyWidget() -widget.setGeometry(100, 100, 500, 355) -widget.show() -sys.exit(app.exec_()) +if __name__ == '__main__': + app = QApplication(sys.argv) + widget = MyWidget() + widget.setGeometry(100, 100, 500, 355) + widget.show() + sys.exit(app.exec_()) |