Merged in PhyNerd/Qt5 (Pull request #18)

Author: chrisjbillington

Camera.py

@@ -126,14 +126,9 @@ def generate_code(self, hdf5_file):
 
 
 import os
-import sys
 
-if 'PySide' in sys.modules.copy():
-    from PySide.QtCore import *
-    from PySide.QtGui import *
-else:
-    from PyQt4.QtCore import *
-    from PyQt4.QtGui import *
+from qtutils.qt.QtCore import *
+from qtutils.qt.QtGui import *
 
 from blacs.tab_base_classes import Worker, define_state
 from blacs.tab_base_classes import MODE_MANUAL, MODE_TRANSITION_TO_BUFFERED, MODE_TRANSITION_TO_MANUAL, MODE_BUFFERED  

PulseBlaster.py

@@ -580,15 +580,10 @@ def add_device(self, device):
 from qtutils import UiLoader
 import qtutils.icons
 import os
-import sys
 
 # We can't import * from QtCore & QtGui, as one of them has a function called bin() which overrides the builtin, which is used in the pulseblaster worker
-if 'PySide' in sys.modules.copy():
-    from PySide import QtCore
-    from PySide import QtGui
-else:
-    from PyQt4 import QtCore
-    from PyQt4 import QtGui
+from qtutils.qt import QtCore
+from qtutils.qt import QtGui
 
 
 

PulseBlaster_No_DDS.py

@@ -80,15 +80,11 @@ def generate_code(self, hdf5_file):
 from qtutils import UiLoader
 import qtutils.icons
 import os
-import sys
 
 # We can't import * from QtCore & QtGui, as one of them has a function called bin() which overrides the builtin, which is used in the pulseblaster worker
-if 'PySide' in sys.modules.copy():
-    from PySide import QtCore
-    from PySide import QtGui
-else:
-    from PyQt4 import QtCore
-    from PyQt4 import QtGui
+from qtutils.qt import QtCore
+from qtutils.qt import QtGui
+from qtutils.qt import QtWidgets
 
 @BLACS_tab
 class Pulseblaster_No_DDS_Tab(DeviceTab):