Merge pull request #129 from jenshnielsen/fix_qt_imports

correctly use QApp from qtwidgets not qtgui

doc/examples/autonode_app.py

@@ -6,7 +6,7 @@
 import numpy as np
 import lmfit
 
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr.data.datadict import DataDictBase
 from plottr.data.qcodes_dataset import QCodesDSLoader
 from plottr.node.tools import linearFlowchart
@@ -61,7 +61,7 @@ def sinefit(self, dataIn: DataDictBase = None):
 
 
 def main(pathAndId):
-    app = QtGui.QApplication([])
+    app = QtWidgets.QApplication([])
 
     # flowchart and window
     fc = linearFlowchart(

test/apps/custom_app.py

@@ -4,7 +4,7 @@
 import numpy as np
 import lmfit
 
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr.data.datadict import DataDictBase, MeshgridDataDict
 from plottr.gui.widgets import makeFlowchartWithPlotWindow
 from plottr.node.dim_reducer import XYSelector
@@ -68,7 +68,7 @@ def makeNodeList():
 
 
 def main():
-    app = QtGui.QApplication([])
+    app = QtWidgets.QApplication([])
 
     # flowchart and window
     nodes = makeNodeList()

test/gui/correct_offset.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr.data.datadict import MeshgridDataDict
 from plottr.gui.widgets import makeFlowchartWithPlotWindow
 from plottr.node.filter.correct_offset import SubtractAverage
@@ -30,8 +30,8 @@ def subtractAverage():
     data2.validate()
 
     # make app and gui, fc
-    app = QtGui.QApplication([])
-    win, fc = makeFlowchartWithAutoPlotWindow([
+    app = QtWidgets.QApplication([])
+    win, fc = makeFlowchartWithPlotWindow([
         ('sub', SubtractAverage)
     ])
     win.show()

test/gui/data_display_widgets.py

@@ -3,7 +3,7 @@
 Testing scripts for GUI elements for data display.
 """
 
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr.gui.tools import widgetDialog
 from plottr.gui.data_display import DataSelectionWidget
 from plottr.utils import testdata
@@ -13,7 +13,7 @@ def test_dataSelectionWidget(readonly: bool = False):
     def selectionCb(selection):
         print(selection)
 
-    # app = QtGui.QApplication([])
+    # app = QtWidgets.QApplication([])
     widget = DataSelectionWidget(readonly=readonly)
     widget.dataSelectionMade.connect(selectionCb)
 

test/gui/ddh5_loader.py

@@ -1,4 +1,4 @@
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr.data import datadict_storage as dds
 from plottr.node.tools import linearFlowchart
 from plottr.gui.tools import widgetDialog
@@ -9,7 +9,7 @@ def cb(*vals):
         print(vals)
 
     if not interactive:
-        app = QtGui.QApplication([])
+        app = QtWidgets.QApplication([])
 
     fc = linearFlowchart(('loader', dds.DDH5Loader))
     loader = fc.nodes()['loader']

test/gui/dimension_assignment.py

@@ -3,7 +3,7 @@
 Testing for axis settings / dimension-reduction widgets.
 """
 
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr.data.datadict import datadict_to_meshgrid
 from plottr.gui.tools import widgetDialog
 from plottr.node.dim_reducer import XYSelectionWidget, DimensionReducer, XYSelector
@@ -15,7 +15,7 @@ def xySelectionWidget():
     def selectionCb(selection):
         print(selection)
 
-    app = QtGui.QApplication([])
+    app = QtWidgets.QApplication([])
     widget = XYSelectionWidget()
     widget.rolesChanged.connect(selectionCb)
 
@@ -32,7 +32,7 @@ def selectionCb(selection):
 
 def dimReduction(interactive=False):
     if not interactive:
-        app = QtGui.QApplication([])
+        app = QtWidgets.QApplication([])
 
     fc = linearFlowchart(('reducer', DimensionReducer))
     reducer = fc.nodes()['reducer']
@@ -51,7 +51,7 @@ def dimReduction(interactive=False):
 
 def xySelection(interactive=False):
     if not interactive:
-        app = QtGui.QApplication([])
+        app = QtWidgets.QApplication([])
 
     fc = linearFlowchart(('xysel', XYSelector))
     selector = fc.nodes()['xysel']

test/gui/simple_2d_plot.py

@@ -1,7 +1,7 @@
 import logging
 import time
 
-from plottr import QtGui
+from plottr import QtWidgets
 from plottr import log
 from plottr.data.datadict import DataDict, datadict_to_meshgrid
 from plottr.utils import testdata
@@ -20,7 +20,7 @@ def setup_logging():
 
 
 def simple_2d_plot():
-    app = QtGui.QApplication([])
+    app = QtWidgets.QApplication([])
     win = PlotWindow()
     plot = AutoPlot(parent=win)
     win.plot.setPlotWidget(plot)
@@ -72,4 +72,4 @@ def simple_2d_plot():
 if __name__ == '__main__':
     from plottr import plottrPath
     print(plottrPath)
-    simple_2d_plot()
+    simple_2d_plot()

test/run_gui_test.py

@@ -4,11 +4,11 @@
 import importlib
 import inspect
 
-from plottr import QtGui, plottrPath
+from plottr import QtWidgets, plottrPath
 
 
 def run(func, **kw):
-    app = QtGui.QApplication([])
+    app = QtWidgets.QApplication([])
     _ = func(**kw)
     return app.exec_()