Changeset a9279cc in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Nov 30, 2016 7:33:01 AM (8 years ago)

Author:

wojciech

Children:

6a569b3

Parents:

4638f1d

Message:

Code cleanup

File:

• src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (4 diffs)

src/sas/sasgui/perspectives/fitting/gpu_options.py

@@ -49 +49 @@
         boxsizer = wx.BoxSizer(orient=wx.VERTICAL)
         self.option_button = {}
-        for index, fitter in enumerate(clinfo):
+        for index, clopt in enumerate(clinfo):
             button = wx.RadioButton(self.panel1, -1,
-                    label=fitter, name=fitter)
-            if fitter != "No OpenCL":
-                self.option_button[fitter] = str(index)
+                    label=clopt, name=clopt)
+            if clopt != "No OpenCL":
+                self.option_button[clopt] = str(index)
             else:
-                self.option_button[fitter] = "None"
+                self.option_button[clopt] = "None"
             self.Bind(wx.EVT_RADIOBUTTON, self.OnRadio, id=button.GetId())
             boxsizer.Add(button, 0, 0)
@@ -68 +68 @@
 
         accept_btn = wx.Button(self, wx.ID_OK)
-        accept_btn.SetToolTipString("Accept new options for GPU")
+        accept_btn.SetToolTipString("Accept OpenCL settings")
 
         help_btn = wx.Button(self, wx.ID_HELP, 'Help')
@@ -74 +74 @@
 
         self.Bind(wx.EVT_BUTTON, self.OnAccept, accept_btn)
-        if help is not None:
-            self.Bind(wx.EVT_BUTTON, self.OnHelp, help_btn)
-
+        self.Bind(wx.EVT_BUTTON, self.OnHelp, help_btn)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
@@ -113 +111 @@
         os.environ["SAS_OPENCL"] = self.option_button[button.Name]
         sasmodels.kernelcl.ENV = None
+        #Need to reload sasmodels.core module to account SAS_OPENCL = "None"
         reload(sasmodels.core)