diff options
20 files changed, 507 insertions, 506 deletions
diff --git a/examples/charts/callout/callout.py b/examples/charts/callout/callout.py index a5751a4b5..747f20072 100644 --- a/examples/charts/callout/callout.py +++ b/examples/charts/callout/callout.py @@ -80,36 +80,36 @@ class Callout(QGraphicsItem): # establish the position of the anchor point in relation to _rect above = anchor.y() <= self._rect.top() - aboveCenter = (anchor.y() > self._rect.top() and + above_center = (anchor.y() > self._rect.top() and anchor.y() <= self._rect.center().y()) - belowCenter = (anchor.y() > self._rect.center().y() and + below_center = (anchor.y() > self._rect.center().y() and anchor.y() <= self._rect.bottom()) below = anchor.y() > self._rect.bottom() - onLeft = anchor.x() <= self._rect.left() - leftOfCenter = (anchor.x() > self._rect.left() and + on_left = anchor.x() <= self._rect.left() + left_of_center = (anchor.x() > self._rect.left() and anchor.x() <= self._rect.center().x()) - rightOfCenter = (anchor.x() > self._rect.center().x() and + right_of_center = (anchor.x() > self._rect.center().x() and anchor.x() <= self._rect.right()) - onRight = anchor.x() > self._rect.right() + on_right = anchor.x() > self._rect.right() # get the nearest _rect corner. - x = (onRight + rightOfCenter) * self._rect.width() - y = (below + belowCenter) * self._rect.height() - cornerCase = ((above and onLeft) or (above and onRight) or - (below and onLeft) or (below and onRight)) + x = (on_right + right_of_center) * self._rect.width() + y = (below + below_center) * self._rect.height() + corner_case = ((above and on_left) or (above and on_right) or + (below and on_left) or (below and on_right)) vertical = abs(anchor.x() - x) > abs(anchor.y() - y) - x1 = (x + leftOfCenter * 10 - rightOfCenter * 20 + cornerCase * - int(not vertical) * (onLeft * 10 - onRight * 20)) - y1 = (y + aboveCenter * 10 - belowCenter * 20 + cornerCase * + x1 = (x + left_of_center * 10 - right_of_center * 20 + corner_case * + int(not vertical) * (on_left * 10 - on_right * 20)) + y1 = (y + above_center * 10 - below_center * 20 + corner_case * vertical * (above * 10 - below * 20)) point1.setX(x1) point1.setY(y1) - x2 = (x + leftOfCenter * 20 - rightOfCenter * 10 + cornerCase * - int(not vertical) * (onLeft * 20 - onRight * 10)) - y2 = (y + aboveCenter * 20 - belowCenter * 10 + cornerCase * + x2 = (x + left_of_center * 20 - right_of_center * 10 + corner_case * + int(not vertical) * (on_left * 20 - on_right * 10)) + y2 = (y + above_center * 20 - below_center * 10 + corner_case * vertical * (above * 20 - below * 10)) point2.setX(x2) point2.setY(y2) @@ -134,7 +134,7 @@ class Callout(QGraphicsItem): else: event.setAccepted(False) - def setText(self, text): + def set_text(self, text): self._text = text metrics = QFontMetrics(self._font) self._textRect = QRectF(metrics.boundingRect( @@ -143,10 +143,10 @@ class Callout(QGraphicsItem): self.prepareGeometryChange() self._rect = self._textRect.adjusted(-5, -5, 5, 5) - def setAnchor(self, point): + def set_anchor(self, point): self._anchor = QPointF(point) - def updateGeometry(self): + def update_geometry(self): self.prepareGeometryChange() self.setPos(self._chart.mapToPosition( self._anchor) + QPointF(10, -50)) @@ -201,10 +201,10 @@ class View(QGraphicsView): self._callouts = [] self._tooltip = Callout(self._chart) - self.series.clicked.connect(self.keepCallout) + self.series.clicked.connect(self.keep_callout) self.series.hovered.connect(self.tooltip) - self.series2.clicked.connect(self.keepCallout) + self.series2.clicked.connect(self.keep_callout) self.series2.hovered.connect(self.tooltip) self.setMouseTracking(True) @@ -232,7 +232,7 @@ class View(QGraphicsView): self._coordY.setText(f"Y: {y:.2f}") QGraphicsView.mouseMoveEvent(self, event) - def keepCallout(self): + def keep_callout(self): self._callouts.append(self._tooltip) self._tooltip = Callout(self._chart) @@ -243,10 +243,10 @@ class View(QGraphicsView): if state: x = point.x() y = point.y() - self._tooltip.setText(f"X: {x:.2f} \nY: {y:.2f} ") - self._tooltip.setAnchor(point) + self._tooltip.set_text(f"X: {x:.2f} \nY: {y:.2f} ") + self._tooltip.set_anchor(point) self._tooltip.setZValue(11) - self._tooltip.updateGeometry() + self._tooltip.update_geometry() self._tooltip.show() else: self._tooltip.hide() diff --git a/examples/charts/chartthemes/main.py b/examples/charts/chartthemes/main.py index 63808a607..a5df1236c 100644 --- a/examples/charts/chartthemes/main.py +++ b/examples/charts/chartthemes/main.py @@ -71,34 +71,34 @@ class ThemeWidget(QWidget): self.populate_legendbox() # Area Chart - chart_view = QChartView(self.create_areachart()) + chart_view = QChartView(self.create_areachart()) self.ui.gridLayout.addWidget(chart_view, 1, 0) self.charts.append(chart_view) # Pie Chart - chart_view = QChartView(self.createPieChart()) + chart_view = QChartView(self.create_pie_chart()) chart_view.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored) self.ui.gridLayout.addWidget(chart_view, 1, 1) self.charts.append(chart_view) # Line Chart - chart_view = QChartView(self.createLineChart()) + chart_view = QChartView(self.create_line_chart()) self.ui.gridLayout.addWidget(chart_view, 1, 2) self.charts.append(chart_view) # Bar Chart - chart_view = QChartView(self.createBarChart()) + chart_view = QChartView(self.create_bar_chart()) self.ui.gridLayout.addWidget(chart_view, 2, 0) self.charts.append(chart_view) # Spline Chart - chart_view = QChartView(self.createSplineChart()) + chart_view = QChartView(self.create_spline_chart()) self.ui.gridLayout.addWidget(chart_view, 2, 1) self.charts.append(chart_view) # Scatter Chart - chart_view = QChartView(self.create_scatterchart()) + chart_view = QChartView(self.create_scatterchart()) self.ui.gridLayout.addWidget(chart_view, 2, 2) self.charts.append(chart_view) @@ -111,7 +111,7 @@ class ThemeWidget(QWidget): pal.setColor(QPalette.WindowText, QColor(0x404044)) qApp.setPalette(pal) - self.updateUI() + self.update_ui() def generate_random_data(self, list_count, value_max, value_count): @@ -189,7 +189,7 @@ class ThemeWidget(QWidget): return chart - def createBarChart(self): + def create_bar_chart(self): chart = QChart() chart.setTitle("Bar chart") @@ -209,7 +209,7 @@ class ThemeWidget(QWidget): return chart - def createLineChart(self): + def create_line_chart(self): chart = QChart() chart.setTitle("Line chart") @@ -229,7 +229,7 @@ class ThemeWidget(QWidget): return chart - def createPieChart(self): + def create_pie_chart(self): chart = QChart() chart.setTitle("Pie chart") @@ -247,7 +247,7 @@ class ThemeWidget(QWidget): return chart - def createSplineChart(self): + def create_spline_chart(self): chart = QChart() chart.setTitle("Spline chart") name = "Series " @@ -285,7 +285,7 @@ class ThemeWidget(QWidget): return chart - def updateUI(self): + def update_ui(self): def set_colors(window_color, text_color): pal = self.window().palette() pal.setColor(QPalette.Window, window_color) diff --git a/examples/charts/chartthemes/themewidget.ui b/examples/charts/chartthemes/themewidget.ui index 9ea2bb7c4..ad1e02f06 100644 --- a/examples/charts/chartthemes/themewidget.ui +++ b/examples/charts/chartthemes/themewidget.ui @@ -76,28 +76,28 @@ <sender>themeComboBox</sender> <signal>currentIndexChanged(int)</signal> <receiver>ThemeWidgetForm</receiver> - <slot>updateUI()</slot> + <slot>update_ui()</slot> </connection> <connection> <sender>antialiasCheckBox</sender> <signal>toggled(bool)</signal> <receiver>ThemeWidgetForm</receiver> - <slot>updateUI()</slot> + <slot>update_ui()</slot> </connection> <connection> <sender>legendComboBox</sender> <signal>currentIndexChanged(int)</signal> <receiver>ThemeWidgetForm</receiver> - <slot>updateUI()</slot> + <slot>update_ui()</slot> </connection> <connection> <sender>animatedComboBox</sender> <signal>currentIndexChanged(int)</signal> <receiver>ThemeWidgetForm</receiver> - <slot>updateUI()</slot> + <slot>update_ui()</slot> </connection> </connections> <slots> - <slot>updateUI()</slot> + <slot>update_ui()</slot> </slots> </ui> diff --git a/examples/charts/chartthemes/ui_themewidget.py b/examples/charts/chartthemes/ui_themewidget.py index d2fdf55bc..e6e937dae 100644 --- a/examples/charts/chartthemes/ui_themewidget.py +++ b/examples/charts/chartthemes/ui_themewidget.py @@ -3,19 +3,19 @@ ################################################################################ ## Form generated from reading UI file 'themewidget.ui' ## -## Created by: Qt User Interface Compiler version 5.14.0 +## Created by: Qt User Interface Compiler version 6.2.0 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) -from PySide6.QtGui import (QColor, QFont, QIcon, QPixmap) +from PySide6.QtCore import * +from PySide6.QtGui import * from PySide6.QtWidgets import * + class Ui_ThemeWidgetForm(object): def setupUi(self, ThemeWidgetForm): - if ThemeWidgetForm.objectName(): + if not ThemeWidgetForm.objectName(): ThemeWidgetForm.setObjectName(u"ThemeWidgetForm") ThemeWidgetForm.resize(900, 600) self.gridLayout = QGridLayout(ThemeWidgetForm) @@ -67,10 +67,10 @@ class Ui_ThemeWidgetForm(object): self.retranslateUi(ThemeWidgetForm) - self.themeComboBox.currentIndexChanged.connect(ThemeWidgetForm.updateUI) - self.antialiasCheckBox.toggled.connect(ThemeWidgetForm.updateUI) - self.legendComboBox.currentIndexChanged.connect(ThemeWidgetForm.updateUI) - self.animatedComboBox.currentIndexChanged.connect(ThemeWidgetForm.updateUI) + self.themeComboBox.currentIndexChanged.connect(ThemeWidgetForm.update_ui) + self.antialiasCheckBox.toggled.connect(ThemeWidgetForm.update_ui) + self.legendComboBox.currentIndexChanged.connect(ThemeWidgetForm.update_ui) + self.animatedComboBox.currentIndexChanged.connect(ThemeWidgetForm.update_ui) QMetaObject.connectSlotsByName(ThemeWidgetForm) # setupUi @@ -80,5 +80,6 @@ class Ui_ThemeWidgetForm(object): self.animatedLabel.setText(QCoreApplication.translate("ThemeWidgetForm", u"Animation:", None)) self.legendLabel.setText(QCoreApplication.translate("ThemeWidgetForm", u"Legend:", None)) self.antialiasCheckBox.setText(QCoreApplication.translate("ThemeWidgetForm", u"Anti-aliasing", None)) + pass # retranslateUi diff --git a/examples/charts/donutbreakdown/donutbreakdown.py b/examples/charts/donutbreakdown/donutbreakdown.py index 51b0956ca..320156bc9 100644 --- a/examples/charts/donutbreakdown/donutbreakdown.py +++ b/examples/charts/donutbreakdown/donutbreakdown.py @@ -59,7 +59,7 @@ class MainSlice(QPieSlice): def get_breakdown_series(self): return self.breakdown_series - def setName(self, name): + def set_name(self, name): self.name = name def name(self): @@ -83,7 +83,7 @@ class DonutBreakdownChart(QChart): # add breakdown series as a slice to center pie main_slice = MainSlice(breakdown_series) - main_slice.setName(breakdown_series.name()) + main_slice.set_name(breakdown_series.name()) main_slice.setValue(breakdown_series.sum()) self.main_series.append(main_slice) diff --git a/examples/charts/legend/legend.py b/examples/charts/legend/legend.py index 71fd94885..639e28f68 100644 --- a/examples/charts/legend/legend.py +++ b/examples/charts/legend/legend.py @@ -156,7 +156,7 @@ class MainWidget(QWidget): self.legend_height.setMaximum(chart_viewrect.height()) self.legend_height.setValue(75) - def hideLegendSpinbox(self): + def hide_legend_spinbox(self): self.legend_settings.setVisible(False) def toggle_attached(self): @@ -172,7 +172,7 @@ class MainWidget(QWidget): else: legend.attachToChart() legend.setBackgroundVisible(False) - self.hideLegendSpinbox() + self.hide_legend_spinbox() self.update() def add_barset(self): diff --git a/examples/charts/lineandbar/lineandbar.py b/examples/charts/lineandbar/lineandbar.py index 219da17b5..a3601c162 100644 --- a/examples/charts/lineandbar/lineandbar.py +++ b/examples/charts/lineandbar/lineandbar.py @@ -65,46 +65,46 @@ class TestChart(QMainWindow): self.set3.append([5, 6, 7, 3, 4, 5]) self.set4.append([9, 7, 5, 3, 1, 2]) - self.barSeries = QBarSeries() - self.barSeries.append(self.set0) - self.barSeries.append(self.set1) - self.barSeries.append(self.set2) - self.barSeries.append(self.set3) - self.barSeries.append(self.set4) - - self.lineSeries = QLineSeries() - self.lineSeries.setName("trend") - self.lineSeries.append(QPoint(0, 4)) - self.lineSeries.append(QPoint(1, 15)) - self.lineSeries.append(QPoint(2, 20)) - self.lineSeries.append(QPoint(3, 4)) - self.lineSeries.append(QPoint(4, 12)) - self.lineSeries.append(QPoint(5, 17)) + self._bar_series = QBarSeries() + self._bar_series.append(self.set0) + self._bar_series.append(self.set1) + self._bar_series.append(self.set2) + self._bar_series.append(self.set3) + self._bar_series.append(self.set4) + + self._line_series = QLineSeries() + self._line_series.setName("trend") + self._line_series.append(QPoint(0, 4)) + self._line_series.append(QPoint(1, 15)) + self._line_series.append(QPoint(2, 20)) + self._line_series.append(QPoint(3, 4)) + self._line_series.append(QPoint(4, 12)) + self._line_series.append(QPoint(5, 17)) self.chart = QChart() - self.chart.addSeries(self.barSeries) - self.chart.addSeries(self.lineSeries) + self.chart.addSeries(self._bar_series) + self.chart.addSeries(self._line_series) self.chart.setTitle("Line and barchart example") self.categories = ["Jan", "Feb", "Mar", "Apr", "May", "Jun"] - self.axisX = QBarCategoryAxis() - self.axisX.append(self.categories) - self.chart.setAxisX(self.axisX, self.lineSeries) - self.chart.setAxisX(self.axisX, self.barSeries) - self.axisX.setRange("Jan", "Jun") + self._axis_x = QBarCategoryAxis() + self._axis_x.append(self.categories) + self.chart.setAxisX(self._axis_x, self._line_series) + self.chart.setAxisX(self._axis_x, self._bar_series) + self._axis_x.setRange("Jan", "Jun") - self.axisY = QValueAxis() - self.chart.setAxisY(self.axisY, self.lineSeries) - self.chart.setAxisY(self.axisY, self.barSeries) - self.axisY.setRange(0, 20) + self._axis_y = QValueAxis() + self.chart.setAxisY(self._axis_y, self._line_series) + self.chart.setAxisY(self._axis_y, self._bar_series) + self._axis_y.setRange(0, 20) self.chart.legend().setVisible(True) self.chart.legend().setAlignment(Qt.AlignBottom) - self.chartView = QChartView(self.chart) - self.chartView.setRenderHint(QPainter.Antialiasing) + self._chart_view = QChartView(self.chart) + self._chart_view.setRenderHint(QPainter.Antialiasing) - self.setCentralWidget(self.chartView) + self.setCentralWidget(self._chart_view) if __name__ == "__main__": diff --git a/examples/charts/linechart/linechart.py b/examples/charts/linechart/linechart.py index 84cd0c8b3..ce81c36d8 100644 --- a/examples/charts/linechart/linechart.py +++ b/examples/charts/linechart/linechart.py @@ -69,10 +69,10 @@ class TestChart(QMainWindow): self.chart.createDefaultAxes() self.chart.setTitle("Simple line chart example") - self.chartView = QChartView(self.chart) - self.chartView.setRenderHint(QPainter.Antialiasing) + self._chart_view = QChartView(self.chart) + self._chart_view.setRenderHint(QPainter.Antialiasing) - self.setCentralWidget(self.chartView) + self.setCentralWidget(self._chart_view) if __name__ == "__main__": diff --git a/examples/charts/logvalueaxis/logvalueaxis.py b/examples/charts/logvalueaxis/logvalueaxis.py index c5e90c584..180940b73 100644 --- a/examples/charts/logvalueaxis/logvalueaxis.py +++ b/examples/charts/logvalueaxis/logvalueaxis.py @@ -64,25 +64,25 @@ class TestChart(QMainWindow): self.chart.legend().hide() self.chart.setTitle("Logarithmic axis example") - self.axisX = QValueAxis() - self.axisX.setTitleText("Data point") - self.axisX.setLabelFormat("%i") - self.axisX.setTickCount(self.series.count()) - self.chart.addAxis(self.axisX, Qt.AlignBottom) - self.series.attachAxis(self.axisX) - - self.axisY = QLogValueAxis() - self.axisY.setTitleText("Values") - self.axisY.setLabelFormat("%g") - self.axisY.setBase(8.0) - self.axisY.setMinorTickCount(-1) - self.chart.addAxis(self.axisY, Qt.AlignLeft) - self.series.attachAxis(self.axisY) - - self.chartView = QChartView(self.chart) - self.chartView.setRenderHint(QPainter.Antialiasing) - - self.setCentralWidget(self.chartView) + self._axis_x = QValueAxis() + self._axis_x.setTitleText("Data point") + self._axis_x.setLabelFormat("%i") + self._axis_x.setTickCount(self.series.count()) + self.chart.addAxis(self._axis_x, Qt.AlignBottom) + self.series.attachAxis(self._axis_x) + + self._axis_y = QLogValueAxis() + self._axis_y.setTitleText("Values") + self._axis_y.setLabelFormat("%g") + self._axis_y.setBase(8.0) + self._axis_y.setMinorTickCount(-1) + self.chart.addAxis(self._axis_y, Qt.AlignLeft) + self.series.attachAxis(self._axis_y) + + self._chart_view = QChartView(self.chart) + self._chart_view.setRenderHint(QPainter.Antialiasing) + + self.setCentralWidget(self._chart_view) if __name__ == "__main__": diff --git a/examples/charts/memoryusage/memoryusage.py b/examples/charts/memoryusage/memoryusage.py index 032e79541..aac03b00f 100644 --- a/examples/charts/memoryusage/memoryusage.py +++ b/examples/charts/memoryusage/memoryusage.py @@ -48,48 +48,48 @@ from PySide6.QtWidgets import QApplication, QMainWindow from PySide6.QtCharts import QChart, QChartView, QPieSeries -def runProcess(command, arguments): +def run_process(command, arguments): process = QProcess() process.start(command, arguments) process.waitForFinished() std_output = process.readAllStandardOutput().data().decode('utf-8') return std_output.split('\n') -def getMemoryUsage(): +def get_memory_usage(): result = [] if sys.platform == 'win32': # Windows: Obtain memory usage in KB from 'tasklist' - for line in runProcess('tasklist', [])[3:]: + for line in run_process('tasklist', [])[3:]: if len(line) >= 74: command = line[0:23].strip() if command.endswith('.exe'): command = command[0:len(command) - 4] - memoryUsage = float(line[64:74].strip().replace(',', '').replace('.', '')) + memory_usage = float(line[64:74].strip().replace(',', '').replace('.', '')) legend = '' - if memoryUsage > 10240: - mb = memoryUsage / 1024 + if memory_usage > 10240: + mb = memory_usage / 1024 legend = f'{command} {mb}M' else: - legend = f'{command} {memoryUsage}K' - result.append([legend, memoryUsage]) + legend = f'{command} {memory_usage}K' + result.append([legend, memory_usage]) else: # Unix: Obtain memory usage percentage from 'ps' - psOptions = ['-e', 'v'] - memoryColumn = 8 - commandColumn = 9 + ps_options = ['-e', 'v'] + memory_column = 8 + command_column = 9 if sys.platform == 'darwin': - psOptions = ['-e', '-v'] - memoryColumn = 11 - commandColumn = 12 - for line in runProcess('ps', psOptions): + ps_options = ['-e', '-v'] + memory_column = 11 + command_column = 12 + for line in run_process('ps', ps_options): tokens = line.split(None) - if len(tokens) > commandColumn and "PID" not in tokens: # Percentage and command - command = tokens[commandColumn] + if len(tokens) > command_column and "PID" not in tokens: # Percentage and command + command = tokens[command_column] if not command.startswith('['): command = os.path.basename(command) - memoryUsage = round(float(tokens[memoryColumn].replace(',', '.'))) - legend = f'{command} {memoryUsage}%' - result.append([legend, memoryUsage]) + memory_usage = round(float(tokens[memory_column].replace(',', '.'))) + legend = f'{command} {memory_usage}%' + result.append([legend, memory_usage]) result.sort(key = lambda x: x[1], reverse=True) return result @@ -101,12 +101,12 @@ class MainWindow(QMainWindow): self.setWindowTitle('Memory Usage') - memoryUsage = getMemoryUsage() - if len(memoryUsage) > 5: - memoryUsage = memoryUsage[0:4] + memory_usage = get_memory_usage() + if len(memory_usage) > 5: + memory_usage = memory_usage[0:4] self.series = QPieSeries() - for item in memoryUsage: + for item in memory_usage: self.series.append(item[0], item[1]) slice = self.series.slices()[0] @@ -114,14 +114,14 @@ class MainWindow(QMainWindow): slice.setLabelVisible() self.chart = QChart() self.chart.addSeries(self.series) - self.chartView = QChartView(self.chart) - self.setCentralWidget(self.chartView) + self._chart_view = QChartView(self.chart) + self.setCentralWidget(self._chart_view) if __name__ == '__main__': app = QApplication(sys.argv) - mainWin = MainWindow() - availableGeometry = mainWin.screen().availableGeometry() - size = availableGeometry.height() * 3 / 4 - mainWin.resize(size, size) - mainWin.show() + main_win = MainWindow() + available_geometry = main_win.screen().availableGeometry() + size = available_geometry.height() * 3 / 4 + main_win.resize(size, size) + main_win.show() sys.exit(app.exec_()) diff --git a/examples/charts/piechart/piechart.py b/examples/charts/piechart/piechart.py index 29947263d..ebb602b0c 100644 --- a/examples/charts/piechart/piechart.py +++ b/examples/charts/piechart/piechart.py @@ -71,10 +71,10 @@ class TestChart(QMainWindow): self.chart.setTitle('Simple piechart example') self.chart.legend().hide() - self.chartView = QChartView(self.chart) - self.chartView.setRenderHint(QPainter.Antialiasing) + self._chart_view = QChartView(self.chart) + self._chart_view.setRenderHint(QPainter.Antialiasing) - self.setCentralWidget(self.chartView) + self.setCentralWidget(self._chart_view) if __name__ == "__main__": diff --git a/examples/charts/temperaturerecords/temperaturerecords.py b/examples/charts/temperaturerecords/temperaturerecords.py index 3a8a86f42..b37b70db2 100644 --- a/examples/charts/temperaturerecords/temperaturerecords.py +++ b/examples/charts/temperaturerecords/temperaturerecords.py @@ -69,16 +69,16 @@ class MainWindow(QMainWindow): categories = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] - axisX = QBarCategoryAxis() - axisX.append(categories) - axisX.setTitleText("Month") - chart.addAxis(axisX, Qt.AlignBottom) - axisY = QValueAxis() - axisY.setRange(-52, 52) - axisY.setTitleText("Temperature [°C]") - chart.addAxis(axisY, Qt.AlignLeft) - series.attachAxis(axisX) - series.attachAxis(axisY) + axis_x = QBarCategoryAxis() + axis_x.append(categories) + axis_x.setTitleText("Month") + chart.addAxis(axis_x, Qt.AlignBottom) + axis_y = QValueAxis() + axis_y.setRange(-52, 52) + axis_y.setTitleText("Temperature [°C]") + chart.addAxis(axis_y, Qt.AlignLeft) + series.attachAxis(axis_x) + series.attachAxis(axis_y) chart.legend().setVisible(True) chart.legend().setAlignment(Qt.AlignBottom) diff --git a/examples/corelib/settingseditor/settingseditor.py b/examples/corelib/settingseditor/settingseditor.py index 8554be637..10e79abf9 100644 --- a/examples/corelib/settingseditor/settingseditor.py +++ b/examples/corelib/settingseditor/settingseditor.py @@ -233,14 +233,14 @@ class MainWindow(QMainWindow): "The <b>Settings Editor</b> example shows how to access " "application settings using Qt.") - def createActions(self): - self.openSettingsAct = QtGui.QAction("&Open Application Settings...", + def create_actions(self): + self._open_settings_act = QtGui.QAction("&Open Application Settings...", self, shortcut="Ctrl+O", triggered=self.openSettings) - self.openIniFileAct = QtGui.QAction("Open I&NI File...", self, + self._open_ini_file_act = QtGui.QAction("Open I&NI File...", self, shortcut="Ctrl+N", triggered=self.openIniFile) - self.openPropertyListAct = QtGui.QAction("Open macOS &Property List...", + self._open_property_list_act = QtGui.QAction("Open macOS &Property List...", self, shortcut="Ctrl+P", triggered=self.openPropertyList) def create_actions(self): @@ -378,17 +378,17 @@ class LocationDialog(QDialog): locations_layout = QVBoxLayout(self.locations_groupbox) locations_layout.addWidget(self.locations_table) - mainLayout = QGridLayout(self) - mainLayout.addWidget(format_label, 0, 0) - mainLayout.addWidget(self.format_combo, 0, 1) - mainLayout.addWidget(scope_label, 1, 0) - mainLayout.addWidget(self.scope_cCombo, 1, 1) - mainLayout.addWidget(organization_label, 2, 0) - mainLayout.addWidget(self.organization_combo, 2, 1) - mainLayout.addWidget(application_label, 3, 0) - mainLayout.addWidget(self.application_combo, 3, 1) - mainLayout.addWidget(self.locations_groupbox, 4, 0, 1, 2) - mainLayout.addWidget(self.button_box, 5, 0, 1, 2) + main_layout = QGridLayout(self) + main_layout.addWidget(format_label, 0, 0) + main_layout.addWidget(self.format_combo, 0, 1) + main_layout.addWidget(scope_label, 1, 0) + main_layout.addWidget(self.scope_cCombo, 1, 1) + main_layout.addWidget(organization_label, 2, 0) + main_layout.addWidget(self.organization_combo, 2, 1) + main_layout.addWidget(application_label, 3, 0) + main_layout.addWidget(self.application_combo, 3, 1) + main_layout.addWidget(self.locations_groupbox, 4, 0, 1, 2) + main_layout.addWidget(self.button_box, 5, 0, 1, 2) self.update_locations() @@ -425,21 +425,21 @@ class LocationDialog(QDialog): if self.scope() == QSettings.SystemScope: continue - actualScope = QSettings.UserScope + actual_scope = QSettings.UserScope else: - actualScope = QSettings.SystemScope + actual_scope = QSettings.SystemScope for j in range(2): if j == 0: if not self.application(): continue - actualApplication = self.application() + actual_application = self.application() else: - actualApplication = '' + actual_application = '' - settings = QSettings(self.format(), actualScope, - self.organization(), actualApplication) + settings = QSettings(self.format(), actual_scope, + self.organization(), actual_application) row = self.locations_table.rowCount() self.locations_table.setRowCount(row + 1) @@ -613,7 +613,7 @@ class SettingsTree(QTreeWidget): if value_type: value = self.settings.value(key, type=value_type) child.setText(1, value.__class__.__name__) - child.setText(2, VariantDelegate.displayText(value)) + child.setText(2, VariantDelegate.display_text(value)) child.setData(2, Qt.UserRole, value) while divider_index < self.child_count(parent): @@ -711,7 +711,7 @@ class VariantDelegate(QItemDelegate): elif isinstance(editor, QSpinBox): editor.setValue(value) else: - editor.setText(self.displayText(value)) + editor.setText(self.display_text(value)) def value_from_lineedit(self, lineedit, model, index): if not lineedit.isModified(): @@ -735,7 +735,7 @@ class VariantDelegate(QItemDelegate): value = self.value_from_lineedit(editor, model, index) if not value is None: model.setData(index, value, Qt.UserRole) - model.setData(index, self.displayText(value), Qt.DisplayRole) + model.setData(index, self.display_text(value), Qt.DisplayRole) @staticmethod def is_supported_type(value): @@ -744,7 +744,7 @@ class VariantDelegate(QItemDelegate): QSize, list)) @staticmethod - def displayText(value): + def display_text(value): if isinstance(value, str): return value if isinstance(value, bool): diff --git a/examples/datavisualization/bars3d/bars3d.py b/examples/datavisualization/bars3d/bars3d.py index e025fcd20..d7d211864 100644 --- a/examples/datavisualization/bars3d/bars3d.py +++ b/examples/datavisualization/bars3d/bars3d.py @@ -49,11 +49,11 @@ from PySide6.QtDataVisualization import (Q3DBars, QBar3DSeries, QBarDataItem, QCategory3DAxis, QValue3DAxis) -def dataToBarDataRow(data): +def data_to_bar_data_row(data): return list(QBarDataItem(d) for d in data) -def dataToBarDataArray(data): - return list(dataToBarDataRow(row) for row in data) +def data_to_bar_data_array(data): + return list(data_to_bar_data_row(row) for row in data) class MainWindow(QMainWindow): @@ -64,30 +64,30 @@ class MainWindow(QMainWindow): self.bars = Q3DBars() - self.columnAxis = QCategory3DAxis() - self.columnAxis.setTitle('Columns') - self.columnAxis.setTitleVisible(True) - self.columnAxis.setLabels(['Column1', 'Column2']) - self.columnAxis.setLabelAutoRotation(30) + self._column_axis = QCategory3DAxis() + self._column_axis.setTitle('Columns') + self._column_axis.setTitleVisible(True) + self._column_axis.setLabels(['Column1', 'Column2']) + self._column_axis.setLabelAutoRotation(30) - self.rowAxis = QCategory3DAxis() - self.rowAxis.setTitle('Rows') - self.rowAxis.setTitleVisible(True) - self.rowAxis.setLabels(['Row1', 'Row2']) - self.rowAxis.setLabelAutoRotation(30) + self._row_axis = QCategory3DAxis() + self._row_axis.setTitle('Rows') + self._row_axis.setTitleVisible(True) + self._row_axis.setLabels(['Row1', 'Row2']) + self._row_axis.setLabelAutoRotation(30) - self.valueAxis = QValue3DAxis() - self.valueAxis.setTitle('Values') - self.valueAxis.setTitleVisible(True) - self.valueAxis.setRange(0, 5) + self._value_axis = QValue3DAxis() + self._value_axis.setTitle('Values') + self._value_axis.setTitleVisible(True) + self._value_axis.setRange(0, 5) - self.bars.setRowAxis(self.rowAxis) - self.bars.setColumnAxis(self.columnAxis) - self.bars.setValueAxis(self.valueAxis) + self.bars.setRowAxis(self._row_axis) + self.bars.setColumnAxis(self._column_axis) + self.bars.setValueAxis(self._value_axis) self.series = QBar3DSeries() - self.arrayData = [[1, 2], [3, 4]] - self.series.dataProxy().addRows(dataToBarDataArray(self.arrayData)) + self._array_data = [[1, 2], [3, 4]] + self.series.dataProxy().addRows(data_to_bar_data_array(self._array_data)) self.bars.setPrimarySeries(self.series) @@ -110,6 +110,6 @@ class MainWindow(QMainWindow): if __name__ == '__main__': app = QApplication(sys.argv) - mainWin = MainWindow() - mainWin.show() + main_win = MainWindow() + main_win.show() sys.exit(app.exec_()) diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.py b/examples/network/blockingfortuneclient/blockingfortuneclient.py index 536110d4e..d053820d4 100644 --- a/examples/network/blockingfortuneclient/blockingfortuneclient.py +++ b/examples/network/blockingfortuneclient/blockingfortuneclient.py @@ -52,7 +52,7 @@ from PySide6.QtNetwork import (QAbstractSocket, QHostAddress, QNetworkInterface, class FortuneThread(QThread): - newFortune = Signal(str) + new_fortune = Signal(str) error = Signal(int, str) @@ -60,7 +60,7 @@ class FortuneThread(QThread): super(FortuneThread, self).__init__(parent) self.quit = False - self.hostName = '' + self._host_name = '' self.cond = QWaitCondition() self.mutex = QMutex() self.port = 0 @@ -72,9 +72,9 @@ class FortuneThread(QThread): self.mutex.unlock() self.wait() - def requestNewFortune(self, hostname, port): + def request_new_fortune(self, hostname, port): locker = QMutexLocker(self.mutex) - self.hostName = hostname + self._host_name = hostname self.port = port if not self.isRunning(): self.start() @@ -83,41 +83,41 @@ class FortuneThread(QThread): def run(self): self.mutex.lock() - serverName = self.hostName - serverPort = self.port + server_name = self._host_name + server_port = self.port self.mutex.unlock() while not self.quit: - Timeout = 5 * 1000 + timeout = 5 * 1000 socket = QTcpSocket() - socket.connectToHost(serverName, serverPort) + socket.connectToHost(server_name, server_port) - if not socket.waitForConnected(Timeout): + if not socket.waitForConnected(timeout): self.error.emit(socket.error(), socket.errorString()) return while socket.bytesAvailable() < 2: - if not socket.waitForReadyRead(Timeout): + if not socket.waitForReadyRead(timeout): self.error.emit(socket.error(), socket.errorString()) return instr = QDataStream(socket) instr.setVersion(QDataStream.Qt_4_0) - blockSize = instr.readUInt16() + block_size = instr.readUInt16() - while socket.bytesAvailable() < blockSize: - if not socket.waitForReadyRead(Timeout): + while socket.bytesAvailable() < block_size: + if not socket.waitForReadyRead(timeout): self.error.emit(socket.error(), socket.errorString()) return self.mutex.lock() fortune = instr.readQString() - self.newFortune.emit(fortune) + self.new_fortune.emit(fortune) self.cond.wait(self.mutex) - serverName = self.hostName - serverPort = self.port + server_name = self._host_name + server_port = self.port self.mutex.unlock() @@ -126,74 +126,74 @@ class BlockingClient(QWidget): super(BlockingClient, self).__init__(parent) self.thread = FortuneThread() - self.currentFortune = '' + self._current_fortune = '' - hostLabel = QLabel("&Server name:") - portLabel = QLabel("S&erver port:") + host_label = QLabel("&Server name:") + port_label = QLabel("S&erver port:") - for ipAddress in QNetworkInterface.allAddresses(): - if ipAddress != QHostAddress.LocalHost and ipAddress.toIPv4Address() != 0: + for ip_address in QNetworkInterface.allAddresses(): + if ip_address != QHostAddress.LocalHost and ip_address.toIPv4Address() != 0: break else: - ipAddress = QHostAddress(QHostAddress.LocalHost) + ip_address = QHostAddress(QHostAddress.LocalHost) - ipAddress = ipAddress.toString() + ip_address = ip_address.toString() - self.hostLineEdit = QLineEdit(ipAddress) - self.portLineEdit = QLineEdit() - self.portLineEdit.setValidator(QIntValidator(1, 65535, self)) + self._host_line_edit = QLineEdit(ip_address) + self._port_line_edit = QLineEdit() + self._port_line_edit.setValidator(QIntValidator(1, 65535, self)) - hostLabel.setBuddy(self.hostLineEdit) - portLabel.setBuddy(self.portLineEdit) + host_label.setBuddy(self._host_line_edit) + port_label.setBuddy(self._port_line_edit) - self.statusLabel = QLabel( + self._status_label = QLabel( "This example requires that you run the Fortune Server example as well.") - self.statusLabel.setWordWrap(True) - - self.getFortuneButton = QPushButton("Get Fortune") - self.getFortuneButton.setDefault(True) - self.getFortuneButton.setEnabled(False) - - quitButton = QPushButton("Quit") - - buttonBox = QDialogButtonBox() - buttonBox.addButton(self.getFortuneButton, QDialogButtonBox.ActionRole) - buttonBox.addButton(quitButton, QDialogButtonBox.RejectRole) - - self.getFortuneButton.clicked.connect(self.requestNewFortune) - quitButton.clicked.connect(self.close) - self.hostLineEdit.textChanged.connect(self.enableGetFortuneButton) - self.portLineEdit.textChanged.connect(self.enableGetFortuneButton) - self.thread.newFortune.connect(self.showFortune) - self.thread.error.connect(self.displayError) - - mainLayout = QGridLayout() - mainLayout.addWidget(hostLabel, 0, 0) - mainLayout.addWidget(self.hostLineEdit, 0, 1) - mainLayout.addWidget(portLabel, 1, 0) - mainLayout.addWidget(self.portLineEdit, 1, 1) - mainLayout.addWidget(self.statusLabel, 2, 0, 1, 2) - mainLayout.addWidget(buttonBox, 3, 0, 1, 2) - self.setLayout(mainLayout) + self._status_label.setWordWrap(True) + + self._get_fortune_button = QPushButton("Get Fortune") + self._get_fortune_button.setDefault(True) + self._get_fortune_button.setEnabled(False) + + quit_button = QPushButton("Quit") + + button_box = QDialogButtonBox() + button_box.addButton(self._get_fortune_button, QDialogButtonBox.ActionRole) + button_box.addButton(quit_button, QDialogButtonBox.RejectRole) + + self._get_fortune_button.clicked.connect(self.request_new_fortune) + quit_button.clicked.connect(self.close) + self._host_line_edit.textChanged.connect(self.enable_get_fortune_button) + self._port_line_edit.textChanged.connect(self.enable_get_fortune_button) + self.thread.new_fortune.connect(self.show_fortune) + self.thread.error.connect(self.display_error) + + main_layout = QGridLayout() + main_layout.addWidget(host_label, 0, 0) + main_layout.addWidget(self._host_line_edit, 0, 1) + main_layout.addWidget(port_label, 1, 0) + main_layout.addWidget(self._port_line_edit, 1, 1) + main_layout.addWidget(self._status_label, 2, 0, 1, 2) + main_layout.addWidget(button_box, 3, 0, 1, 2) + self.setLayout(main_layout) self.setWindowTitle("Blocking Fortune Client") - self.portLineEdit.setFocus() + self._port_line_edit.setFocus() - def requestNewFortune(self): - self.getFortuneButton.setEnabled(False) - self.thread.requestNewFortune(self.hostLineEdit.text(), - int(self.portLineEdit.text())) + def request_new_fortune(self): + self._get_fortune_button.setEnabled(False) + self.thread.request_new_fortune(self._host_line_edit.text(), + int(self._port_line_edit.text())) - def showFortune(self, nextFortune): - if nextFortune == self.currentFortune: - self.requestNewFortune() + def show_fortune(self, nextFortune): + if nextFortune == self._current_fortune: + self.request_new_fortune() return - self.currentFortune = nextFortune - self.statusLabel.setText(self.currentFortune) - self.getFortuneButton.setEnabled(True) + self._current_fortune = nextFortune + self._status_label.setText(self._current_fortune) + self._get_fortune_button.setEnabled(True) - def displayError(self, socketError, message): + def display_error(self, socketError, message): if socketError == QAbstractSocket.HostNotFoundError: QMessageBox.information(self, "Blocking Fortune Client", "The host was not found. Please check the host and port " @@ -207,11 +207,11 @@ class BlockingClient(QWidget): QMessageBox.information(self, "Blocking Fortune Client", f"The following error occurred: {message}.") - self.getFortuneButton.setEnabled(True) + self._get_fortune_button.setEnabled(True) - def enableGetFortuneButton(self): - self.getFortuneButton.setEnabled(self.hostLineEdit.text() != '' and - self.portLineEdit.text() != '') + def enable_get_fortune_button(self): + self._get_fortune_button.setEnabled(self._host_line_edit.text() != '' and + self._port_line_edit.text() != '') if __name__ == '__main__': diff --git a/examples/network/fortuneclient/fortuneclient.py b/examples/network/fortuneclient/fortuneclient.py index 2e6d6d559..a783a0cbf 100644 --- a/examples/network/fortuneclient/fortuneclient.py +++ b/examples/network/fortuneclient/fortuneclient.py @@ -49,85 +49,85 @@ class Client(QtWidgets.QDialog): def __init__(self, parent=None): super(Client, self).__init__(parent) - self.blockSize = 0 - self.currentFortune = '' + self._block_size = 0 + self._current_fortune = '' - hostLabel = QtWidgets.QLabel("&Server name:") - portLabel = QtWidgets.QLabel("S&erver port:") + host_label = QtWidgets.QLabel("&Server name:") + port_label = QtWidgets.QLabel("S&erver port:") - self.hostLineEdit = QtWidgets.QLineEdit('Localhost') - self.portLineEdit = QtWidgets.QLineEdit() - self.portLineEdit.setValidator(QtGui.QIntValidator(1, 65535, self)) + self._host_line_edit = QtWidgets.QLineEdit('Localhost') + self._port_line_edit = QtWidgets.QLineEdit() + self._port_line_edit.setValidator(QtGui.QIntValidator(1, 65535, self)) - hostLabel.setBuddy(self.hostLineEdit) - portLabel.setBuddy(self.portLineEdit) + host_label.setBuddy(self._host_line_edit) + port_label.setBuddy(self._port_line_edit) - self.statusLabel = QtWidgets.QLabel("This examples requires that you run " + self._status_label = QtWidgets.QLabel("This examples requires that you run " "the Fortune Server example as well.") - self.getFortuneButton = QtWidgets.QPushButton("Get Fortune") - self.getFortuneButton.setDefault(True) - self.getFortuneButton.setEnabled(False) + self._get_fortune_button = QtWidgets.QPushButton("Get Fortune") + self._get_fortune_button.setDefault(True) + self._get_fortune_button.setEnabled(False) - quitButton = QtWidgets.QPushButton("Quit") + quit_button = QtWidgets.QPushButton("Quit") - buttonBox = QtWidgets.QDialogButtonBox() - buttonBox.addButton(self.getFortuneButton, + button_box = QtWidgets.QDialogButtonBox() + button_box.addButton(self._get_fortune_button, QtWidgets.QDialogButtonBox.ActionRole) - buttonBox.addButton(quitButton, QtWidgets.QDialogButtonBox.RejectRole) - - self.tcpSocket = QtNetwork.QTcpSocket(self) - - self.hostLineEdit.textChanged.connect(self.enableGetFortuneButton) - self.portLineEdit.textChanged.connect(self.enableGetFortuneButton) - self.getFortuneButton.clicked.connect(self.requestNewFortune) - quitButton.clicked.connect(self.close) - self.tcpSocket.readyRead.connect(self.readFortune) - self.tcpSocket.errorOccurred.connect(self.displayError) - - mainLayout = QtWidgets.QGridLayout() - mainLayout.addWidget(hostLabel, 0, 0) - mainLayout.addWidget(self.hostLineEdit, 0, 1) - mainLayout.addWidget(portLabel, 1, 0) - mainLayout.addWidget(self.portLineEdit, 1, 1) - mainLayout.addWidget(self.statusLabel, 2, 0, 1, 2) - mainLayout.addWidget(buttonBox, 3, 0, 1, 2) - self.setLayout(mainLayout) + button_box.addButton(quit_button, QtWidgets.QDialogButtonBox.RejectRole) + + self._tcp_socket = QtNetwork.QTcpSocket(self) + + self._host_line_edit.textChanged.connect(self.enable_get_fortune_button) + self._port_line_edit.textChanged.connect(self.enable_get_fortune_button) + self._get_fortune_button.clicked.connect(self.request_new_fortune) + quit_button.clicked.connect(self.close) + self._tcp_socket.readyRead.connect(self.read_fortune) + self._tcp_socket.errorOccurred.connect(self.display_error) + + main_layout = QtWidgets.QGridLayout() + main_layout.addWidget(host_label, 0, 0) + main_layout.addWidget(self._host_line_edit, 0, 1) + main_layout.addWidget(port_label, 1, 0) + main_layout.addWidget(self._port_line_edit, 1, 1) + main_layout.addWidget(self._status_label, 2, 0, 1, 2) + main_layout.addWidget(button_box, 3, 0, 1, 2) + self.setLayout(main_layout) self.setWindowTitle("Fortune Client") - self.portLineEdit.setFocus() + self._port_line_edit.setFocus() - def requestNewFortune(self): - self.getFortuneButton.setEnabled(False) - self.blockSize = 0 - self.tcpSocket.abort() - self.tcpSocket.connectToHost(self.hostLineEdit.text(), - int(self.portLineEdit.text())) + def request_new_fortune(self): + self._get_fortune_button.setEnabled(False) + self._block_size = 0 + self._tcp_socket.abort() + self._tcp_socket.connectToHost(self._host_line_edit.text(), + int(self._port_line_edit.text())) - def readFortune(self): - instr = QtCore.QDataStream(self.tcpSocket) + def read_fortune(self): + instr = QtCore.QDataStream(self._tcp_socket) instr.setVersion(QtCore.QDataStream.Qt_4_0) - if self.blockSize == 0: - if self.tcpSocket.bytesAvailable() < 2: + if self._block_size == 0: + if self._tcp_socket.bytesAvailable() < 2: return - self.blockSize = instr.readUInt16() + self._block_size = instr.readUInt16() - if self.tcpSocket.bytesAvailable() < self.blockSize: + if self._tcp_socket.bytesAvailable() < self._block_size: return - nextFortune = instr.readString() + next_fortune = instr.readString() - if nextFortune == self.currentFortune: - QtCore.QTimer.singleShot(0, self.requestNewFortune) + if next_fortune == self._current_fortune: + QtCore.QTimer.singleShot(0, self.request_new_fortune) return - self.currentFortune = nextFortune - self.statusLabel.setText(self.currentFortune) - self.getFortuneButton.setEnabled(True) + self._current_fortune = next_fortune + self._status_label.setText(self._current_fortune) + self._get_fortune_button.setEnabled(True) - def displayError(self, socketError): + def display_error(self, socketError): if socketError == QtNetwork.QAbstractSocket.RemoteHostClosedError: pass elif socketError == QtNetwork.QAbstractSocket.HostNotFoundError: @@ -140,15 +140,15 @@ class Client(QtWidgets.QDialog): "fortune server is running, and check that the host name " "and port settings are correct.") else: - reason = self.tcpSocket.errorString() + reason = self._tcp_socket.errorString() QtWidgets.QMessageBox.information(self, "Fortune Client", f"The following error occurred: {reason}.") - self.getFortuneButton.setEnabled(True) + self._get_fortune_button.setEnabled(True) - def enableGetFortuneButton(self): - self.getFortuneButton.setEnabled(bool(self.hostLineEdit.text() and - self.portLineEdit.text())) + def enable_get_fortune_button(self): + self._get_fortune_button.setEnabled(bool(self._host_line_edit.text() and + self._port_line_edit.text())) if __name__ == '__main__': diff --git a/examples/network/fortuneserver/fortuneserver.py b/examples/network/fortuneserver/fortuneserver.py index e3087f1c1..f4a32dca0 100644 --- a/examples/network/fortuneserver/fortuneserver.py +++ b/examples/network/fortuneserver/fortuneserver.py @@ -51,20 +51,20 @@ class Server(QtWidgets.QDialog): def __init__(self, parent=None): super(Server, self).__init__(parent) - statusLabel = QtWidgets.QLabel() - statusLabel.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) - quitButton = QtWidgets.QPushButton("Quit") - quitButton.setAutoDefault(False) - - self.tcpServer = QtNetwork.QTcpServer(self) - if not self.tcpServer.listen(): - reason = self.tcpServer.errorString() + status_label = QtWidgets.QLabel() + status_label.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) + quit_button = QtWidgets.QPushButton("Quit") + quit_button.setAutoDefault(False) + + self._tcp_server = QtNetwork.QTcpServer(self) + if not self._tcp_server.listen(): + reason = self._tcp_server.errorString() QtWidgets.QMessageBox.critical(self, "Fortune Server", f"Unable to start the server: {reason}.") self.close() return - port = self.tcpServer.serverPort() - statusLabel.setText(f"The server is running on port {port}.\nRun the " + port = self._tcp_server.serverPort() + status_label.setText(f"The server is running on port {port}.\nRun the " "Fortune Client example now.") self.fortunes = ( @@ -76,22 +76,22 @@ class Server(QtWidgets.QDialog): "You cannot kill time without injuring eternity.", "Computers are not intelligent. They only think they are.") - quitButton.clicked.connect(self.close) - self.tcpServer.newConnection.connect(self.sendFortune) + quit_button.clicked.connect(self.close) + self._tcp_server.newConnection.connect(self.send_fortune) - buttonLayout = QtWidgets.QHBoxLayout() - buttonLayout.addStretch(1) - buttonLayout.addWidget(quitButton) - buttonLayout.addStretch(1) + button_layout = QtWidgets.QHBoxLayout() + button_layout.addStretch(1) + button_layout.addWidget(quit_button) + button_layout.addStretch(1) - mainLayout = QtWidgets.QVBoxLayout() - mainLayout.addWidget(statusLabel) - mainLayout.addLayout(buttonLayout) - self.setLayout(mainLayout) + main_layout = QtWidgets.QVBoxLayout() + main_layout.addWidget(status_label) + main_layout.addLayout(button_layout) + self.setLayout(main_layout) self.setWindowTitle("Fortune Server") - def sendFortune(self): + def send_fortune(self): block = QtCore.QByteArray() out = QtCore.QDataStream(block, QtCore.QIODevice.WriteOnly) out.setVersion(QtCore.QDataStream.Qt_4_0) @@ -102,11 +102,11 @@ class Server(QtWidgets.QDialog): out.device().seek(0) out.writeUInt16(block.size() - 2) - clientConnection = self.tcpServer.nextPendingConnection() - clientConnection.disconnected.connect(clientConnection.deleteLater) + client_connection = self._tcp_server.nextPendingConnection() + client_connection.disconnected.connect(client_connection.deleteLater) - clientConnection.write(block) - clientConnection.disconnectFromHost() + client_connection.write(block) + client_connection.disconnectFromHost() if __name__ == '__main__': diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.py b/examples/network/threadedfortuneserver/threadedfortuneserver.py index deb993b71..c42103073 100644 --- a/examples/network/threadedfortuneserver/threadedfortuneserver.py +++ b/examples/network/threadedfortuneserver/threadedfortuneserver.py @@ -58,13 +58,13 @@ class FortuneThread(QThread): def __init__(self, socketDescriptor, fortune, parent): super(FortuneThread, self).__init__(parent) - self.socketDescriptor = socketDescriptor + self._socket_descriptor = socketDescriptor self.text = fortune def run(self): - tcpSocket = QTcpSocket() - if not tcpSocket.setSocketDescriptor(self.socketDescriptor): - self.error.emit(tcpSocket.error()) + tcp_socket = QTcpSocket() + if not tcp_socket.setSocketDescriptor(self._socket_descriptor): + self.error.emit(tcp_socket.error()) return block = QByteArray() @@ -75,9 +75,9 @@ class FortuneThread(QThread): outstr.device().seek(0) outstr.writeUInt16(block.size() - 2) - tcpSocket.write(block) - tcpSocket.disconnectFromHost() - tcpSocket.waitForDisconnected() + tcp_socket.write(block) + tcp_socket.disconnectFromHost() + tcp_socket.waitForDisconnected() class FortuneServer(QTcpServer): @@ -104,11 +104,11 @@ class Dialog(QDialog): self.server = FortuneServer() - statusLabel = QLabel() - statusLabel.setTextInteractionFlags(Qt.TextBrowserInteraction) - statusLabel.setWordWrap(True) - quitButton = QPushButton("Quit") - quitButton.setAutoDefault(False) + status_label = QLabel() + status_label.setTextInteractionFlags(Qt.TextBrowserInteraction) + status_label.setWordWrap(True) + quit_button = QPushButton("Quit") + quit_button.setAutoDefault(False) if not self.server.listen(): reason = self.server.errorString() @@ -117,29 +117,29 @@ class Dialog(QDialog): self.close() return - for ipAddress in QNetworkInterface.allAddresses(): - if ipAddress != QHostAddress.LocalHost and ipAddress.toIPv4Address() != 0: + for ip_address in QNetworkInterface.allAddresses(): + if ip_address != QHostAddress.LocalHost and ip_address.toIPv4Address() != 0: break else: - ipAddress = QHostAddress(QHostAddress.LocalHost) + ip_address = QHostAddress(QHostAddress.LocalHost) - ipAddress = ipAddress.toString() + ip_address = ip_address.toString() port = self.server.serverPort() - statusLabel.setText(f"The server is running on\n\nIP: {ipAddress}\nport: {port}\n\n" + status_label.setText(f"The server is running on\n\nIP: {ip_address}\nport: {port}\n\n" "Run the Fortune Client example now.") - quitButton.clicked.connect(self.close) + quit_button.clicked.connect(self.close) - buttonLayout = QHBoxLayout() - buttonLayout.addStretch(1) - buttonLayout.addWidget(quitButton) - buttonLayout.addStretch(1) + button_layout = QHBoxLayout() + button_layout.addStretch(1) + button_layout.addWidget(quit_button) + button_layout.addStretch(1) - mainLayout = QVBoxLayout() - mainLayout.addWidget(statusLabel) - mainLayout.addLayout(buttonLayout) - self.setLayout(mainLayout) + main_layout = QVBoxLayout() + main_layout.addWidget(status_label) + main_layout.addLayout(button_layout) + self.setLayout(main_layout) self.setWindowTitle("Threaded Fortune Server") diff --git a/examples/opengl/contextinfo/contextinfo.py b/examples/opengl/contextinfo/contextinfo.py index dae848ded..8a1fb3e3d 100644 --- a/examples/opengl/contextinfo/contextinfo.py +++ b/examples/opengl/contextinfo/contextinfo.py @@ -58,14 +58,14 @@ try: from OpenGL import GL except ImportError: app = QApplication(sys.argv) - messageBox = QMessageBox(QMessageBox.Critical, "ContextInfo", + message_box = QMessageBox(QMessageBox.Critical, "ContextInfo", "PyOpenGL must be installed to run this example.", QMessageBox.Close) - messageBox.setDetailedText("Run:\npip install PyOpenGL PyOpenGL_accelerate") - messageBox.exec_() + message_box.setDetailedText("Run:\npip install PyOpenGL PyOpenGL_accelerate") + message_box.exec_() sys.exit(1) -vertexShaderSource110 = dedent(""" +vertex_shader_source_110 = dedent(""" // version 110 attribute highp vec4 posAttr; attribute lowp vec4 colAttr; @@ -77,7 +77,7 @@ vertexShaderSource110 = dedent(""" } """) -fragmentShaderSource110 = dedent(""" +fragment_shader_source_110 = dedent(""" // version 110 varying lowp vec4 col; void main() { @@ -85,7 +85,7 @@ fragmentShaderSource110 = dedent(""" } """) -vertexShaderSource = dedent(""" +vertex_shader_source = dedent(""" // version 150 in vec4 posAttr; in vec4 colAttr; @@ -97,7 +97,7 @@ vertexShaderSource = dedent(""" } """) -fragmentShaderSource = dedent(""" +fragment_shader_source = dedent(""" // version 150 in vec4 col; out vec4 fragColor; @@ -129,56 +129,56 @@ class RenderWindow(QWindow): self.timer = None self.angle = 0 - def initGl(self): + def init_gl(self): self.program = QOpenGLShaderProgram(self) self.vao = QOpenGLVertexArrayObject() self.vbo = QOpenGLBuffer() format = self.context.format() - useNewStyleShader = format.profile() == QSurfaceFormat.CoreProfile + use_new_style_shader = format.profile() == QSurfaceFormat.CoreProfile # Try to handle 3.0 & 3.1 that do not have the core/compatibility profile # concept 3.2+ has. This may still fail since version 150 (3.2) is # specified in the sources but it's worth a try. if (format.renderableType() == QSurfaceFormat.OpenGL and format.majorVersion() == 3 and format.minorVersion() <= 1): - useNewStyleShader = not format.testOption(QSurfaceFormat.DeprecatedFunctions) + use_new_style_shader = not format.testOption(QSurfaceFormat.DeprecatedFunctions) - vertexShader = vertexShaderSource if useNewStyleShader else vertexShaderSource110 - fragmentShader = fragmentShaderSource if useNewStyleShader else fragmentShaderSource110 - if not self.program.addShaderFromSourceCode(QOpenGLShader.Vertex, vertexShader): + vertex_shader = vertex_shader_source if use_new_style_shader else vertex_shader_source_110 + fragment_shader = fragment_shader_source if use_new_style_shader else fragment_shader_source_110 + if not self.program.addShaderFromSourceCode(QOpenGLShader.Vertex, vertex_shader): log = self.program.log() raise Exception("Vertex shader could not be added: {log} ({vertexShader})") - if not self.program.addShaderFromSourceCode(QOpenGLShader.Fragment, fragmentShader): + if not self.program.addShaderFromSourceCode(QOpenGLShader.Fragment, fragment_shader): log = self.program.log() - raise Exception(f"Fragment shader could not be added: {log} ({fragmentShader})") + raise Exception(f"Fragment shader could not be added: {log} ({fragment_shader})") if not self.program.link(): log = self.program.log() raise Exception(f"Could not link shaders: {log}") - self.posAttr = self.program.attributeLocation("posAttr") - self.colAttr = self.program.attributeLocation("colAttr") - self.matrixUniform = self.program.uniformLocation("matrix") + self._pos_attr = self.program.attributeLocation("posAttr") + self._col_attr = self.program.attributeLocation("colAttr") + self._matrix_uniform = self.program.uniformLocation("matrix") self.vbo.create() self.vbo.bind() - self.verticesData = vertices.tobytes() - self.colorsData = colors.tobytes() - verticesSize = 4 * vertices.size - colorsSize = 4 * colors.size - self.vbo.allocate(VoidPtr(self.verticesData), verticesSize + colorsSize) - self.vbo.write(verticesSize, VoidPtr(self.colorsData), colorsSize) + self._vertices_data = vertices.tobytes() + self._colors_data = colors.tobytes() + vertices_size = 4 * vertices.size + colors_size = 4 * colors.size + self.vbo.allocate(VoidPtr(self._vertices_data), vertices_size + colors_size) + self.vbo.write(vertices_size, VoidPtr(self._colors_data), colors_size) self.vbo.release() - vaoBinder = QOpenGLVertexArrayObject.Binder(self.vao) + vao_binder = QOpenGLVertexArrayObject.Binder(self.vao) if self.vao.isCreated(): # have VAO support, use it - self.setupVertexAttribs() + self.setup_vertex_attribs() - def setupVertexAttribs(self): + def setup_vertex_attribs(self): self.vbo.bind() - self.program.setAttributeBuffer(self.posAttr, GL.GL_FLOAT, 0, 2) - self.program.setAttributeBuffer(self.colAttr, GL.GL_FLOAT, 4 * vertices.size, 3) - self.program.enableAttributeArray(self.posAttr) - self.program.enableAttributeArray(self.colAttr) + self.program.setAttributeBuffer(self._pos_attr, GL.GL_FLOAT, 0, 2) + self.program.setAttributeBuffer(self._col_attr, GL.GL_FLOAT, 4 * vertices.size, 3) + self.program.enableAttributeArray(self._pos_attr) + self.program.enableAttributeArray(self._col_attr) self.vbo.release() def exposeEvent(self, event): @@ -186,7 +186,7 @@ class RenderWindow(QWindow): self.render() if self.timer is None: self.timer = QTimer(self) - self.timer.timeout.connect(self.slotTimer) + self.timer.timeout.connect(self.slot_timer) if not self.timer.isActive(): self.timer.start(10) else: @@ -200,11 +200,11 @@ class RenderWindow(QWindow): if self.program is None: functions.glEnable(GL.GL_DEPTH_TEST) functions.glClearColor(0, 0, 0, 1) - self.initGl() + self.init_gl() - retinaScale = self.devicePixelRatio() - functions.glViewport(0, 0, self.width() * retinaScale, - self.height() * retinaScale) + retina_scale = self.devicePixelRatio() + functions.glViewport(0, 0, self.width() * retina_scale, + self.height() * retina_scale) functions.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT) self.program.bind() @@ -212,12 +212,12 @@ class RenderWindow(QWindow): matrix.perspective(60, 4 / 3, 0.1, 100) matrix.translate(0, 0, -2) matrix.rotate(self.angle, 0, 1, 0) - self.program.setUniformValue(self.matrixUniform, matrix) + self.program.setUniformValue(self._matrix_uniform, matrix) if self.vao.isCreated(): self.vao.bind() else: # no VAO support, set the vertex attribute arrays now - self.setupVertexAttribs() + self.setup_vertex_attribs() functions.glDrawArrays(GL.GL_TRIANGLES, 0, 3) @@ -229,7 +229,7 @@ class RenderWindow(QWindow): self.context.swapBuffers(self) self.context.doneCurrent() - def slotTimer(self): + def slot_timer(self): self.render() self.angle += 1 @@ -250,21 +250,21 @@ class RenderWindow(QWindow): class MainWindow(QWidget): def __init__(self): super(MainWindow, self).__init__() - hBoxLayout = QHBoxLayout(self) - self.plainTextEdit = QPlainTextEdit() - self.plainTextEdit.setMinimumWidth(400) - self.plainTextEdit.setReadOnly(True) - hBoxLayout.addWidget(self.plainTextEdit) - self.renderWindow = RenderWindow(QSurfaceFormat()) - container = QWidget.createWindowContainer(self.renderWindow) + h_box_layout = QHBoxLayout(self) + self._plain_text_edit = QPlainTextEdit() + self._plain_text_edit.setMinimumWidth(400) + self._plain_text_edit.setReadOnly(True) + h_box_layout.addWidget(self._plain_text_edit) + self._render_window = RenderWindow(QSurfaceFormat()) + container = QWidget.createWindowContainer(self._render_window) container.setMinimumSize(QSize(400, 400)) - hBoxLayout.addWidget(container) + h_box_layout.addWidget(container) - def updateDescription(self): + def update_description(self): build = QLibraryInfo.build() - gl = self.renderWindow.glInfo() + gl = self._render_window.glInfo() text = f"{build}\n\nPython {sys.version}\n\n{gl}" - self.plainTextEdit.setPlainText(text) + self._plain_text_edit.setPlainText(text) if __name__ == '__main__': parser = ArgumentParser(description="contextinfo", formatter_class=RawTextHelpFormatter) @@ -283,7 +283,7 @@ if __name__ == '__main__': QCoreApplication.setAttribute(Qt.AA_UseDesktopOpenGL) app = QApplication(sys.argv) - mainWindow = MainWindow() - mainWindow.show() - mainWindow.updateDescription() + main_window = MainWindow() + main_window.show() + main_window.update_description() sys.exit(app.exec_()) diff --git a/examples/xml/dombookmarks/dombookmarks.py b/examples/xml/dombookmarks/dombookmarks.py index 91aaf78d4..4590d0a72 100644 --- a/examples/xml/dombookmarks/dombookmarks.py +++ b/examples/xml/dombookmarks/dombookmarks.py @@ -49,11 +49,11 @@ class MainWindow(QtWidgets.QMainWindow): def __init__(self, parent=None): super(MainWindow, self).__init__(parent) - self.xbelTree = XbelTree() - self.setCentralWidget(self.xbelTree) + self._xbel_tree = XbelTree() + self.setCentralWidget(self._xbel_tree) - self.createActions() - self.createMenus() + self.create_actions() + self.create_menus() self.statusBar().showMessage("Ready") @@ -61,39 +61,39 @@ class MainWindow(QtWidgets.QMainWindow): self.resize(480, 320) def open(self): - fileName = QtWidgets.QFileDialog.getOpenFileName(self, + file_name = QtWidgets.QFileDialog.getOpenFileName(self, "Open Bookmark File", QtCore.QDir.currentPath(), "XBEL Files (*.xbel *.xml)")[0] - if not fileName: + if not file_name: return - inFile = QtCore.QFile(fileName) - if not inFile.open(QtCore.QFile.ReadOnly | QtCore.QFile.Text): - reason = inFile.errorString() + in_file = QtCore.QFile(file_name) + if not in_file.open(QtCore.QFile.ReadOnly | QtCore.QFile.Text): + reason = in_file.errorString() QtWidgets.QMessageBox.warning(self, "DOM Bookmarks", - f"Cannot read file {fileName}:\n{reason}.") + f"Cannot read file {file_name}:\n{reason}.") return - if self.xbelTree.read(inFile): + if self._xbel_tree.read(in_file): self.statusBar().showMessage("File loaded", 2000) - def saveAs(self): - fileName = QtWidgets.QFileDialog.getSaveFileName(self, + def save_as(self): + file_name = QtWidgets.QFileDialog.getSaveFileName(self, "Save Bookmark File", QtCore.QDir.currentPath(), "XBEL Files (*.xbel *.xml)")[0] - if not fileName: + if not file_name: return - outFile = QtCore.QFile(fileName) - if not outFile.open(QtCore.QFile.WriteOnly | QtCore.QFile.Text): - reason = outFile.errorString() + out_file = QtCore.QFile(file_name) + if not out_file.open(QtCore.QFile.WriteOnly | QtCore.QFile.Text): + reason = out_file.errorString() QtWidgets.QMessageBox.warning(self, "DOM Bookmarks", "Cannot write file {fileName}:\n{reason}.") return - if self.xbelTree.write(outFile): + if self._xbel_tree.write(out_file): self.statusBar().showMessage("File saved", 2000) def about(self): @@ -101,32 +101,32 @@ class MainWindow(QtWidgets.QMainWindow): "The <b>DOM Bookmarks</b> example demonstrates how to use Qt's " "DOM classes to read and write XML documents.") - def createActions(self): - self.openAct = QtGui.QAction("&Open...", self, shortcut="Ctrl+O", + def create_actions(self): + self._open_act = QtGui.QAction("&Open...", self, shortcut="Ctrl+O", triggered=self.open) - self.saveAsAct = QtGui.QAction("&Save As...", self, shortcut="Ctrl+S", - triggered=self.saveAs) + self._save_as_act = QtGui.QAction("&Save As...", self, shortcut="Ctrl+S", + triggered=self.save_as) - self.exitAct = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", + self._exit_act = QtGui.QAction("E&xit", self, shortcut="Ctrl+Q", triggered=self.close) - self.aboutAct = QtGui.QAction("&About", self, triggered=self.about) + self._about_act = QtGui.QAction("&About", self, triggered=self.about) - self.aboutQtAct = QtGui.QAction("About &Qt", self, + self._about_qt_act = QtGui.QAction("About &Qt", self, triggered=qApp.aboutQt) - def createMenus(self): - self.fileMenu = self.menuBar().addMenu("&File") - self.fileMenu.addAction(self.openAct) - self.fileMenu.addAction(self.saveAsAct) - self.fileMenu.addAction(self.exitAct) + def create_menus(self): + self._file_menu = self.menuBar().addMenu("&File") + self._file_menu.addAction(self._open_act) + self._file_menu.addAction(self._save_as_act) + self._file_menu.addAction(self._exit_act) self.menuBar().addSeparator() - self.helpMenu = self.menuBar().addMenu("&Help") - self.helpMenu.addAction(self.aboutAct) - self.helpMenu.addAction(self.aboutQtAct) + self._help_menu = self.menuBar().addMenu("&Help") + self._help_menu.addAction(self._about_act) + self._help_menu.addAction(self._about_qt_act) class XbelTree(QtWidgets.QTreeWidget): @@ -136,27 +136,27 @@ class XbelTree(QtWidgets.QTreeWidget): self.header().setSectionResizeMode(QtWidgets.QHeaderView.Stretch) self.setHeaderLabels(("Title", "Location")) - self.domDocument = QtXml.QDomDocument() + self._dom_document = QtXml.QDomDocument() - self.domElementForItem = {} + self._dom_element_for_item = {} - self.folderIcon = QtGui.QIcon() - self.bookmarkIcon = QtGui.QIcon() + self._folder_icon = QtGui.QIcon() + self._bookmark_icon = QtGui.QIcon() - self.folderIcon.addPixmap(self.style().standardPixmap(QtWidgets.QStyle.SP_DirClosedIcon), + self._folder_icon.addPixmap(self.style().standardPixmap(QtWidgets.QStyle.SP_DirClosedIcon), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.folderIcon.addPixmap(self.style().standardPixmap(QtWidgets.QStyle.SP_DirOpenIcon), + self._folder_icon.addPixmap(self.style().standardPixmap(QtWidgets.QStyle.SP_DirOpenIcon), QtGui.QIcon.Normal, QtGui.QIcon.On) - self.bookmarkIcon.addPixmap(self.style().standardPixmap(QtWidgets.QStyle.SP_FileIcon)) + self._bookmark_icon.addPixmap(self.style().standardPixmap(QtWidgets.QStyle.SP_FileIcon)) def read(self, device): - ok, errorStr, errorLine, errorColumn = self.domDocument.setContent(device, True) + ok, errorStr, errorLine, errorColumn = self._dom_document.setContent(device, True) if not ok: QtWidgets.QMessageBox.information(self.window(), "DOM Bookmarks", f"Parse error at line {errorLine}, column {errorColumn}:\n{errorStr}") return False - root = self.domDocument.documentElement() + root = self._dom_document.documentElement() if root.tagName() != 'xbel': QtWidgets.QMessageBox.information(self.window(), "DOM Bookmarks", "The file is not an XBEL file.") @@ -170,50 +170,50 @@ class XbelTree(QtWidgets.QTreeWidget): # It might not be connected. try: - self.itemChanged.disconnect(self.updateDomElement) + self.itemChanged.disconnect(self.update_dom_element) except: pass child = root.firstChildElement('folder') while not child.isNull(): - self.parseFolderElement(child) + self.parse_folder_element(child) child = child.nextSiblingElement('folder') - self.itemChanged.connect(self.updateDomElement) + self.itemChanged.connect(self.update_dom_element) return True def write(self, device): - indentSize = 4 + INDENT_SIZE = 4 out = QtCore.QTextStream(device) - self.domDocument.save(out, indentSize) + self._dom_document.save(out, INDENT_SIZE) return True - def updateDomElement(self, item, column): - element = self.domElementForItem.get(id(item)) + def update_dom_element(self, item, column): + element = self._dom_element_for_item.get(id(item)) if not element.isNull(): if column == 0: - oldTitleElement = element.firstChildElement('title') - newTitleElement = self.domDocument.createElement('title') + old_title_element = element.firstChildElement('title') + new_title_element = self._dom_document.createElement('title') - newTitleText = self.domDocument.createTextNode(item.text(0)) - newTitleElement.appendChild(newTitleText) + new_title_text = self._dom_document.createTextNode(item.text(0)) + new_title_element.appendChild(new_title_text) - element.replaceChild(newTitleElement, oldTitleElement) + element.replaceChild(new_title_element, old_title_element) else: if element.tagName() == 'bookmark': element.setAttribute('href', item.text(1)) - def parseFolderElement(self, element, parentItem=None): - item = self.createItem(element, parentItem) + def parse_folder_element(self, element, parentItem=None): + item = self.create_item(element, parentItem) title = element.firstChildElement('title').text() if not title: title = "Folder" item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setIcon(0, self.folderIcon) + item.setIcon(0, self._folder_icon) item.setText(0, title) folded = (element.attribute('folded') != 'no') @@ -222,26 +222,26 @@ class XbelTree(QtWidgets.QTreeWidget): child = element.firstChildElement() while not child.isNull(): if child.tagName() == 'folder': - self.parseFolderElement(child, item) + self.parse_folder_element(child, item) elif child.tagName() == 'bookmark': - childItem = self.createItem(child, item) + child_item = self.create_item(child, item) title = child.firstChildElement('title').text() if not title: title = "Folder" - childItem.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - childItem.setIcon(0, self.bookmarkIcon) - childItem.setText(0, title) - childItem.setText(1, child.attribute('href')) + child_item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) + child_item.setIcon(0, self._bookmark_icon) + child_item.setText(0, title) + child_item.setText(1, child.attribute('href')) elif child.tagName() == 'separator': - childItem = self.createItem(child, item) - childItem.setFlags(item.flags() & ~(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEditable)) - childItem.setText(0, 30 * "\xb7") + child_item = self.create_item(child, item) + child_item.setFlags(item.flags() & ~(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEditable)) + child_item.setText(0, 30 * "\xb7") child = child.nextSiblingElement() - def createItem(self, element, parentItem=None): + def create_item(self, element, parentItem=None): item = QtWidgets.QTreeWidgetItem() if parentItem is not None: @@ -249,7 +249,7 @@ class XbelTree(QtWidgets.QTreeWidget): else: item = QtWidgets.QTreeWidgetItem(self) - self.domElementForItem[id(item)] = element + self._dom_element_for_item[id(item)] = element return item @@ -258,7 +258,7 @@ if __name__ == '__main__': import sys app = QtWidgets.QApplication(sys.argv) - mainWin = MainWindow() - mainWin.show() - mainWin.open() + main_win = MainWindow() + main_win.show() + main_win.open() sys.exit(app.exec_()) |