Changeset 1543f0c in sasview for src/sas/qtgui/Perspectives/Fitting/GPUOptions.py

Timestamp:

Nov 10, 2017 7:24:52 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f1f3e6a

Parents:

1ba88515

Message:

Updated GPUOptions for py3/qt5

File:

• src/sas/qtgui/Perspectives/Fitting/GPUOptions.py (modified) (10 diffs)

src/sas/qtgui/Perspectives/Fitting/GPUOptions.py

@@ -7 +7 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from PyQt4 import QtGui, QtCore, QtWebKit
+from PyQt5 import QtGui, QtCore, QtWebKit, QtWidgets
 from sas.qtgui.Perspectives.Fitting.UI.GPUOptionsUI import Ui_GPUOptions
 from sas.qtgui.Perspectives.Fitting.UI.GPUTestResultsUI import Ui_GPUTestResults
@@ -18 +18 @@
 
 try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
+    _encoding = QtWidgets.QApplication.UnicodeUTF8
     def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+        return QtWidgets.QApplication.translate(context, text, disambig, _encoding)
 except AttributeError:
     def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
-
-
-class GPUOptions(QtGui.QDialog, Ui_GPUOptions):
+        return QtWidgets.QApplication.translate(context, text, disambig)
+
+
+class GPUOptions(QtWidgets.QDialog, Ui_GPUOptions):
     """
     OpenCL Dialog to select the desired OpenCL driver
@@ -39 +39 @@
         self.setupUi(self)
         self.addOpenCLOptions()
-        self.setFixedSize(self.size())
         self.createLinks()
 
@@ -51 +50 @@
         for title, descr in cl_tuple:
             # Create an item for each openCL option
-            check_box = QtGui.QCheckBox()
+            check_box = QtWidgets.QCheckBox()
             check_box.setObjectName(_fromUtf8(descr))
             check_box.setText(_translate("GPUOptions", descr, None))
@@ -59 +58 @@
                 check_box.click()
                 self.clicked = True
-        self.openCLCheckBoxGroup.setMinimumWidth(
-            self.optionsLayout.sizeHint().width())
-        self.setMinimumWidth(self.verticalLayout.sizeHint().width())
+        self.openCLCheckBoxGroup.setMinimumWidth(self.optionsLayout.sizeHint().width()+10)
 
     def createLinks(self):
@@ -69 +66 @@
         self.testButton.clicked.connect(self.testButtonClicked)
         self.helpButton.clicked.connect(self.helpButtonClicked)
-        for item in self.openCLCheckBoxGroup.findChildren(QtGui.QCheckBox):
+        for item in self.openCLCheckBoxGroup.findChildren(QtWidgets.QCheckBox):
             item.clicked.connect(self.checked)
 
@@ -77 +74 @@
         """
         checked = None
-        for box in self.openCLCheckBoxGroup.findChildren(QtGui.QCheckBox):
+        for box in self.openCLCheckBoxGroup.findChildren(QtWidgets.QCheckBox):
             if box.isChecked() and (str(box.text()) == self.sas_open_cl or (
                     str(box.text()) == "No OpenCL" and self.sas_open_cl == "")):
@@ -103 +100 @@
         if 'sasmodels.kernelcl' in sys.modules:
             sasmodels.kernelcl.ENV = None
+        from importlib import reload # assumed Python > 3.3
         reload(sasmodels.core)
         return no_opencl_msg
@@ -199 +197 @@
 
 
-class GPUTestResults(QtGui.QDialog, Ui_GPUTestResults):
+class GPUTestResults(QtWidgets.QDialog, Ui_GPUTestResults):
     """
     OpenCL Dialog to modify the OpenCL options
@@ -207 +205 @@
         self.setupUi(self)
         self.resultsText.setText(_translate("GPUTestResults", msg, None))
-        self.setFixedSize(self.size())
+        #self.setFixedSize(self.size())
         self.open()