Changeset c82fd8f in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 25, 2017 4:01:01 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:

ced1bff

Parents:

83710be

Message:

Ensure the selected openCL selection retains its state when opening and closing the window.

File:

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

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

@@ -45 +45 @@
         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)
@@ -111 +113 @@
         Close the window without modifying SAS_OPENCL
         """
-        # FIXME: Reset option to original value
-        self.close()
-        self.open()
+        self.closeEvent(None)
+        self.parent.gpu_options_widget.open()
 
     def accept(self):
@@ -131 +132 @@
 
         reload(sasmodels.core)
-        super(GPUOptions, self).accept()
+        super(GPUOptions, self).reject()
 
     def closeEvent(self, event):
@@ -137 +138 @@
         Overwrite QDialog close method to allow for custom widget close
         """
-        self.parent.gpu_options_widget = reload(GPUOptions(self))
-        self.reject()
+        self.close()
+        self.parent.gpu_options_widget = GPUOptions(self)