From 92016d3d5a2815f13ad0cd8ef08352e6a9741669 Mon Sep 17 00:00:00 2001 From: KIU Shueng Chuan Date: Sun, 10 Jan 2021 20:05:27 +0800 Subject: [PATCH] add imports of _pyside6 files --- examples/ExampleApp.py | 2 ++ examples/ScatterPlotSpeedTest.py | 2 ++ examples/VideoSpeedTest.py | 2 ++ pyqtgraph/GraphicsScene/exportDialog.py | 2 ++ pyqtgraph/canvas/Canvas.py | 2 ++ pyqtgraph/canvas/CanvasItem.py | 2 ++ pyqtgraph/console/Console.py | 2 ++ pyqtgraph/flowchart/Flowchart.py | 3 +++ pyqtgraph/graphicsItems/PlotItem/PlotItem.py | 2 ++ pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py | 2 ++ pyqtgraph/imageview/ImageView.py | 2 ++ 11 files changed, 23 insertions(+) diff --git a/examples/ExampleApp.py b/examples/ExampleApp.py index ef280979..4c1a637d 100644 --- a/examples/ExampleApp.py +++ b/examples/ExampleApp.py @@ -16,6 +16,8 @@ if QT_LIB == 'PySide': from exampleLoaderTemplate_pyside import Ui_Form elif QT_LIB == 'PySide2': from exampleLoaderTemplate_pyside2 import Ui_Form +elif QT_LIB == 'PySide6': + from exampleLoaderTemplate_pyside6 import Ui_Form elif QT_LIB == 'PyQt5': from exampleLoaderTemplate_pyqt5 import Ui_Form else: diff --git a/examples/ScatterPlotSpeedTest.py b/examples/ScatterPlotSpeedTest.py index 7167b819..db48fe81 100644 --- a/examples/ScatterPlotSpeedTest.py +++ b/examples/ScatterPlotSpeedTest.py @@ -24,6 +24,8 @@ if QT_LIB == 'PySide': from ScatterPlotSpeedTestTemplate_pyside import Ui_Form elif QT_LIB == 'PySide2': from ScatterPlotSpeedTestTemplate_pyside2 import Ui_Form +elif QT_LIB == 'PySide6': + from ScatterPlotSpeedTestTemplate_pyside6 import Ui_Form elif QT_LIB == 'PyQt5': from ScatterPlotSpeedTestTemplate_pyqt5 import Ui_Form else: diff --git a/examples/VideoSpeedTest.py b/examples/VideoSpeedTest.py index 7131f9d1..21fb929a 100644 --- a/examples/VideoSpeedTest.py +++ b/examples/VideoSpeedTest.py @@ -19,6 +19,8 @@ if QT_LIB == 'PySide': import VideoTemplate_pyside as VideoTemplate elif QT_LIB == 'PySide2': import VideoTemplate_pyside2 as VideoTemplate +elif QT_LIB == 'PySide6': + import VideoTemplate_pyside6 as VideoTemplate elif QT_LIB == 'PyQt5': import VideoTemplate_pyqt5 as VideoTemplate else: diff --git a/pyqtgraph/GraphicsScene/exportDialog.py b/pyqtgraph/GraphicsScene/exportDialog.py index 61f2233d..45b2e796 100644 --- a/pyqtgraph/GraphicsScene/exportDialog.py +++ b/pyqtgraph/GraphicsScene/exportDialog.py @@ -8,6 +8,8 @@ if QT_LIB == 'PySide': from . import exportDialogTemplate_pyside as exportDialogTemplate elif QT_LIB == 'PySide2': from . import exportDialogTemplate_pyside2 as exportDialogTemplate +elif QT_LIB == 'PySide6': + from . import exportDialogTemplate_pyside6 as exportDialogTemplate elif QT_LIB == 'PyQt5': from . import exportDialogTemplate_pyqt5 as exportDialogTemplate else: diff --git a/pyqtgraph/canvas/Canvas.py b/pyqtgraph/canvas/Canvas.py index 2ec13b19..7c394a93 100644 --- a/pyqtgraph/canvas/Canvas.py +++ b/pyqtgraph/canvas/Canvas.py @@ -11,6 +11,8 @@ elif QT_LIB == 'PyQt4': from .CanvasTemplate_pyqt import * elif QT_LIB == 'PySide2': from .CanvasTemplate_pyside2 import * +elif QT_LIB == 'PySide6': + from .CanvasTemplate_pyside6 import * elif QT_LIB == 'PyQt5': from .CanvasTemplate_pyqt5 import * diff --git a/pyqtgraph/canvas/CanvasItem.py b/pyqtgraph/canvas/CanvasItem.py index 57174b5f..98daab80 100644 --- a/pyqtgraph/canvas/CanvasItem.py +++ b/pyqtgraph/canvas/CanvasItem.py @@ -9,6 +9,8 @@ elif QT_LIB == 'PyQt4': from . import TransformGuiTemplate_pyqt as TransformGuiTemplate elif QT_LIB == 'PySide2': from . import TransformGuiTemplate_pyside2 as TransformGuiTemplate +elif QT_LIB == 'PySide6': + from . import TransformGuiTemplate_pyside6 as TransformGuiTemplate elif QT_LIB == 'PyQt5': from . import TransformGuiTemplate_pyqt5 as TransformGuiTemplate diff --git a/pyqtgraph/console/Console.py b/pyqtgraph/console/Console.py index 43cfff00..2aa0575d 100644 --- a/pyqtgraph/console/Console.py +++ b/pyqtgraph/console/Console.py @@ -11,6 +11,8 @@ if QT_LIB == 'PySide': from . import template_pyside as template elif QT_LIB == 'PySide2': from . import template_pyside2 as template +elif QT_LIB == 'PySide6': + from . import template_pyside6 as template elif QT_LIB == 'PyQt5': from . import template_pyqt5 as template else: diff --git a/pyqtgraph/flowchart/Flowchart.py b/pyqtgraph/flowchart/Flowchart.py index 9e85296b..abe950d9 100644 --- a/pyqtgraph/flowchart/Flowchart.py +++ b/pyqtgraph/flowchart/Flowchart.py @@ -12,6 +12,9 @@ if QT_LIB == 'PySide': elif QT_LIB == 'PySide2': from . import FlowchartTemplate_pyside2 as FlowchartTemplate from . import FlowchartCtrlTemplate_pyside2 as FlowchartCtrlTemplate +elif QT_LIB == 'PySide6': + from . import FlowchartTemplate_pyside6 as FlowchartTemplate + from . import FlowchartCtrlTemplate_pyside6 as FlowchartCtrlTemplate elif QT_LIB == 'PyQt5': from . import FlowchartTemplate_pyqt5 as FlowchartTemplate from . import FlowchartCtrlTemplate_pyqt5 as FlowchartCtrlTemplate diff --git a/pyqtgraph/graphicsItems/PlotItem/PlotItem.py b/pyqtgraph/graphicsItems/PlotItem/PlotItem.py index 94617116..2da0c242 100644 --- a/pyqtgraph/graphicsItems/PlotItem/PlotItem.py +++ b/pyqtgraph/graphicsItems/PlotItem/PlotItem.py @@ -27,6 +27,8 @@ elif QT_LIB == 'PyQt5': from .plotConfigTemplate_pyqt5 import * elif QT_LIB == 'PySide2': from .plotConfigTemplate_pyside2 import * +elif QT_LIB == 'PySide6': + from .plotConfigTemplate_pyside6 import * __all__ = ['PlotItem'] diff --git a/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py b/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py index 1f44bdd6..43263c3d 100644 --- a/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py +++ b/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py @@ -11,6 +11,8 @@ elif QT_LIB == 'PyQt5': from .axisCtrlTemplate_pyqt5 import Ui_Form as AxisCtrlTemplate elif QT_LIB == 'PySide2': from .axisCtrlTemplate_pyside2 import Ui_Form as AxisCtrlTemplate +elif QT_LIB == 'PySide6': + from .axisCtrlTemplate_pyside6 import Ui_Form as AxisCtrlTemplate import weakref diff --git a/pyqtgraph/imageview/ImageView.py b/pyqtgraph/imageview/ImageView.py index c8974fa5..346a5f0f 100644 --- a/pyqtgraph/imageview/ImageView.py +++ b/pyqtgraph/imageview/ImageView.py @@ -20,6 +20,8 @@ if QT_LIB == 'PySide': from .ImageViewTemplate_pyside import * elif QT_LIB == 'PySide2': from .ImageViewTemplate_pyside2 import * +elif QT_LIB == 'PySide6': + from .ImageViewTemplate_pyside6 import * elif QT_LIB == 'PyQt5': from .ImageViewTemplate_pyqt5 import * else: