Changeset 37be27f in sasview

Timestamp:

Oct 25, 2017 5:19:41 AM (7 years ago)

Author:

krzywon

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:

9863343

Parents:

0bb1397

Message:

Code cleanup on OpenCL Qt dialog.

File:

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

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

@@ -27 +27 @@
 class GPUOptions(QtGui.QDialog, Ui_GPUOptions):
     """
-    OpenCL Dialog to modify the OpenCL options
+    OpenCL Dialog to select the desired OpenCL driver
     """
 
@@ -48 +48 @@
         i = 0
         self.sas_open_cl = os.environ.get("SAS_OPENCL", "")
-        self.setWindowFlags(self.windowFlags() | QtCore.Qt.CustomizeWindowHint)
-        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowCloseButtonHint)
         for title, descr in cl_tuple:
-            checkBox = QtGui.QCheckBox(self.openCLCheckBoxGroup)
-            checkBox.setGeometry(20, 20 + i, 351, 30)
-            checkBox.setObjectName(_fromUtf8(descr))
-            checkBox.setText(_translate("GPUOptions", descr, None))
-            if (descr == self.sas_open_cl) or (title == "None" and not self.clicked):
-                checkBox.click()
+            # Create an list item for each openCL option
+            check_box = QtGui.QCheckBox(self.openCLCheckBoxGroup)
+            check_box.setGeometry(20, 20 + i, 351, 30)
+            check_box.setObjectName(_fromUtf8(descr))
+            check_box.setText(_translate("GPUOptions", descr, None))
+            if (descr == self.sas_open_cl) or (
+                            title == "None" and not self.clicked):
+                check_box.click()
                 self.clicked = True
+
             # Expand group and shift items down as more are added
             self.openCLCheckBoxGroup.resize(391, 60 + i)
@@ -70 +71 @@
     def createLinks(self):
         """
-        Link actions to function calls
+        Link user interactions to function calls
         """
         self.testButton.clicked.connect(lambda: self.testButtonClicked())
@@ -79 +80 @@
     def checked(self):
         """
-        Action triggered when box is selected
+        Only allow a single check box to be selected. Uncheck others.
         """
         checked = None
         for box in self.openCLCheckBoxGroup.findChildren(QtGui.QCheckBox):
             if box.isChecked() and (str(box.text()) == self.sas_open_cl or (
-                            str(box.text()) == "No OpenCL" and self.sas_open_cl == "")):
+                    str(box.text()) == "No OpenCL" and self.sas_open_cl == "")):
                 box.setChecked(False)
-            elif not box.isChecked():
-                pass
-            else:
+            elif box.isChecked():
                 checked = box
         if hasattr(checked, "text"):
@@ -97 +96 @@
     def set_sas_open_cl(self):
         """
-        Set openCL value when tests run or OK button clicked
+        Set SAS_OPENCL value when tests run or OK button clicked
         """
         no_opencl_msg = False
@@ -221 +220 @@
 def _get_clinfo():
     """
-    Reading in information about available OpenCL infrastructure
-    :return:
+    Read in information about available OpenCL infrastructure
     """
     clinfo = []
@@ -243 +241 @@
             else:
                 combined_index = str(d_index)
-            clinfo.append((combined_index, ":".join([platform.name, device.name])))
+            clinfo.append((combined_index, ":".join([platform.name,
+                                                     device.name])))
             d_index += 1
         p_index += 1