Changeset 1df1025 in sasview

Timestamp:

Oct 24, 2017 12:31:38 PM (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:

83710be

Parents:

a6cd8d1

Message:

SAS_OPENCL updates properly.

File:

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

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

@@ -28 +28 @@
 
     clicked = False
-    checkBoxes = None
     sas_open_cl = None
 
@@ -46 +45 @@
         i = 0
         self.sas_open_cl = os.environ.get("SAS_OPENCL", "")
-        self.checkBoxes = []
         for title, descr in cl_tuple:
             checkBox = QtGui.QCheckBox(self.openCLCheckBoxGroup)
@@ -55 +53 @@
                 checkBox.click()
                 self.clicked = True
-            self.checkBoxes.append(checkBox)
             # Expand group and shift items down as more are added
             self.openCLCheckBoxGroup.resize(391, 60 + i)
@@ -71 +68 @@
         self.testButton.clicked.connect(lambda: self.testButtonClicked())
         self.helpButton.clicked.connect(lambda: self.helpButtonClicked())
-        self.openCLCheckBoxGroup.clicked.connect(lambda: self.checked())
+        for item in self.openCLCheckBoxGroup.findChildren(QtGui.QCheckBox):
+            item.clicked.connect(lambda: self.checked())
 
     def checked(self):
@@ -77 +75 @@
         Action triggered when box is selected
         """
-        selected_box = None
-        for box in self.checkBoxes:
-            if box.isChecked() and box.getText() != self.sas_open_cl:
-                selected_box = box
+        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 == "")):
+                box.setChecked(False)
+            elif not box.isChecked():
+                pass
             else:
-                box.setChecked(False)
-        if selected_box.getText():
-            self.sas_open_cl = self.option_button[selected_box.title]
+                checked = box
+        if hasattr(checked, "text"):
+            self.sas_open_cl = str(checked.text())
         else:
             self.sas_open_cl = None
@@ -105 +106 @@
         """
         self.close()
-        self.parent.gpu_options_widget = GPUOptions(self)
         self.open()
 
@@ -130 +130 @@
         Overwrite QDialog close method to allow for custom widget close
         """
+        self.parent.gpu_options_widget = reload(GPUOptions(self))
         self.reject()