From 33743aeb2be37d166bcc3291a98dd22026871cef Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Fri, 5 Feb 2021 10:07:19 +0100 Subject: examples: directory structure When generating the gallery automatically, the structure of the examples was not the same for all the modules. This reorganization was made under the following assumption: An example requires: - its own directory, - a '.pyproject' file, - one or more '.py' files, - extra files (likes images, .rc, .ui, etc) Even for cases when subdirectories are made to depict categories, like 'widgets/state-machine/...', one directory is required per example. There should not be '.pyproject' files for categories, except for the general 'examples.pyproject' to open all of them. Task-number: PYSIDE-1490 Pick-to: 6.0 Change-Id: Ie690773c816a248016dbebaad90fbb1d1c2aeea5 Reviewed-by: Cristian Maureira-Fredes --- examples/datavisualization/bars3d.py | 115 --------------------- examples/datavisualization/bars3d/bars3d.py | 115 +++++++++++++++++++++ examples/datavisualization/bars3d/bars3d.pyproject | 3 + .../datavisualization/datavisualization.pyproject | 3 - 4 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 examples/datavisualization/bars3d.py create mode 100644 examples/datavisualization/bars3d/bars3d.py create mode 100644 examples/datavisualization/bars3d/bars3d.pyproject delete mode 100644 examples/datavisualization/datavisualization.pyproject (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/bars3d.py b/examples/datavisualization/bars3d.py deleted file mode 100644 index e025fcd20..000000000 --- a/examples/datavisualization/bars3d.py +++ /dev/null @@ -1,115 +0,0 @@ - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Qt for Python examples of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of The Qt Company Ltd nor the names of its -## contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# - -"""PySide6 QtDataVisualization example""" - -import sys -from PySide6.QtCore import Qt -from PySide6.QtGui import QGuiApplication -from PySide6.QtWidgets import QApplication, QSizePolicy, QMainWindow, QWidget -from PySide6.QtDataVisualization import (Q3DBars, QBar3DSeries, QBarDataItem, - QCategory3DAxis, QValue3DAxis) - - -def dataToBarDataRow(data): - return list(QBarDataItem(d) for d in data) - -def dataToBarDataArray(data): - return list(dataToBarDataRow(row) for row in data) - -class MainWindow(QMainWindow): - - def __init__(self): - super(MainWindow, self).__init__() - - self.setWindowTitle('Qt DataVisualization 3D Bars') - - self.bars = Q3DBars() - - self.columnAxis = QCategory3DAxis() - self.columnAxis.setTitle('Columns') - self.columnAxis.setTitleVisible(True) - self.columnAxis.setLabels(['Column1', 'Column2']) - self.columnAxis.setLabelAutoRotation(30) - - self.rowAxis = QCategory3DAxis() - self.rowAxis.setTitle('Rows') - self.rowAxis.setTitleVisible(True) - self.rowAxis.setLabels(['Row1', 'Row2']) - self.rowAxis.setLabelAutoRotation(30) - - self.valueAxis = QValue3DAxis() - self.valueAxis.setTitle('Values') - self.valueAxis.setTitleVisible(True) - self.valueAxis.setRange(0, 5) - - self.bars.setRowAxis(self.rowAxis) - self.bars.setColumnAxis(self.columnAxis) - self.bars.setValueAxis(self.valueAxis) - - self.series = QBar3DSeries() - self.arrayData = [[1, 2], [3, 4]] - self.series.dataProxy().addRows(dataToBarDataArray(self.arrayData)) - - self.bars.setPrimarySeries(self.series) - - self.container = QWidget.createWindowContainer(self.bars) - - if not self.bars.hasContext(): - print("Couldn't initialize the OpenGL context.") - sys.exit(-1) - - camera = self.bars.scene().activeCamera() - camera.setYRotation(22.5) - - geometry = QGuiApplication.primaryScreen().geometry() - size = geometry.height() * 3 / 4 - self.container.setMinimumSize(size, size) - - self.container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) - self.container.setFocusPolicy(Qt.StrongFocus) - self.setCentralWidget(self.container) - -if __name__ == '__main__': - app = QApplication(sys.argv) - mainWin = MainWindow() - mainWin.show() - sys.exit(app.exec_()) diff --git a/examples/datavisualization/bars3d/bars3d.py b/examples/datavisualization/bars3d/bars3d.py new file mode 100644 index 000000000..e025fcd20 --- /dev/null +++ b/examples/datavisualization/bars3d/bars3d.py @@ -0,0 +1,115 @@ + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the Qt for Python examples of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:BSD$ +## You may use this file under the terms of the BSD license as follows: +## +## "Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions are +## met: +## * Redistributions of source code must retain the above copyright +## notice, this list of conditions and the following disclaimer. +## * Redistributions in binary form must reproduce the above copyright +## notice, this list of conditions and the following disclaimer in +## the documentation and/or other materials provided with the +## distribution. +## * Neither the name of The Qt Company Ltd nor the names of its +## contributors may be used to endorse or promote products derived +## from this software without specific prior written permission. +## +## +## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +## +## $QT_END_LICENSE$ +## +############################################################################# + +"""PySide6 QtDataVisualization example""" + +import sys +from PySide6.QtCore import Qt +from PySide6.QtGui import QGuiApplication +from PySide6.QtWidgets import QApplication, QSizePolicy, QMainWindow, QWidget +from PySide6.QtDataVisualization import (Q3DBars, QBar3DSeries, QBarDataItem, + QCategory3DAxis, QValue3DAxis) + + +def dataToBarDataRow(data): + return list(QBarDataItem(d) for d in data) + +def dataToBarDataArray(data): + return list(dataToBarDataRow(row) for row in data) + +class MainWindow(QMainWindow): + + def __init__(self): + super(MainWindow, self).__init__() + + self.setWindowTitle('Qt DataVisualization 3D Bars') + + self.bars = Q3DBars() + + self.columnAxis = QCategory3DAxis() + self.columnAxis.setTitle('Columns') + self.columnAxis.setTitleVisible(True) + self.columnAxis.setLabels(['Column1', 'Column2']) + self.columnAxis.setLabelAutoRotation(30) + + self.rowAxis = QCategory3DAxis() + self.rowAxis.setTitle('Rows') + self.rowAxis.setTitleVisible(True) + self.rowAxis.setLabels(['Row1', 'Row2']) + self.rowAxis.setLabelAutoRotation(30) + + self.valueAxis = QValue3DAxis() + self.valueAxis.setTitle('Values') + self.valueAxis.setTitleVisible(True) + self.valueAxis.setRange(0, 5) + + self.bars.setRowAxis(self.rowAxis) + self.bars.setColumnAxis(self.columnAxis) + self.bars.setValueAxis(self.valueAxis) + + self.series = QBar3DSeries() + self.arrayData = [[1, 2], [3, 4]] + self.series.dataProxy().addRows(dataToBarDataArray(self.arrayData)) + + self.bars.setPrimarySeries(self.series) + + self.container = QWidget.createWindowContainer(self.bars) + + if not self.bars.hasContext(): + print("Couldn't initialize the OpenGL context.") + sys.exit(-1) + + camera = self.bars.scene().activeCamera() + camera.setYRotation(22.5) + + geometry = QGuiApplication.primaryScreen().geometry() + size = geometry.height() * 3 / 4 + self.container.setMinimumSize(size, size) + + self.container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + self.container.setFocusPolicy(Qt.StrongFocus) + self.setCentralWidget(self.container) + +if __name__ == '__main__': + app = QApplication(sys.argv) + mainWin = MainWindow() + mainWin.show() + sys.exit(app.exec_()) diff --git a/examples/datavisualization/bars3d/bars3d.pyproject b/examples/datavisualization/bars3d/bars3d.pyproject new file mode 100644 index 000000000..415133f09 --- /dev/null +++ b/examples/datavisualization/bars3d/bars3d.pyproject @@ -0,0 +1,3 @@ +{ + "files": ["bars3d.py"] +} diff --git a/examples/datavisualization/datavisualization.pyproject b/examples/datavisualization/datavisualization.pyproject deleted file mode 100644 index 415133f09..000000000 --- a/examples/datavisualization/datavisualization.pyproject +++ /dev/null @@ -1,3 +0,0 @@ -{ - "files": ["bars3d.py"] -} -- cgit v1.2.3