Changeset 8f02f7f in sasview

Timestamp:

Dec 5, 2016 2:57:20 AM (8 years ago)

Author:

wojciech

Children:

71ac835

Parents:

075c460

Message:

Code clean-up after review by PR

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• gpu_options.py (modified) (9 diffs)

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

@@ -45 +45 @@
 from sas.sasgui.guiframe.gui_manager import MDIFrame
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.perspectives.fitting.gpu_options import GpuOptions
 
 from . import models
@@ -810 +811 @@
         Make the Fit Results panel visible.
         """
-        import sas.sasgui.perspectives.fitting.gpu_options as GpuOptions
-        dialog = GpuOptions.GpuOptions(None, -1, "")
+        dialog = GpuOptions(None, wx.ID_ANY, "")
         dialog.Show()
 

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

@@ -1 +1 @@
 '''
+Module provides dialog for setting SAS_OPENCL variable, which defines
+device choice for OpenCL calculation
+
 Created on Nov 29, 2016
 
@@ -7 +10 @@
 import os
 import warnings
-
 import wx
-import wx.richtext
-import wx.lib.hyperlink
 
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
@@ -16 +16 @@
 class GpuOptions(wx.Dialog):
     """
-    "Acknowledgement" Dialog Box
+    "OpenCL options" Dialog Box
 
-    Shows the current method for acknowledging SasView in
-    scholarly publications.
+    Provides dialog for setting SAS_OPENCL variable, which defines
+    device choice for OpenCL calculation
 
     """
@@ -42 +42 @@
             else:
                 self.option_button[clopt] = "None"
-            self.Bind(wx.EVT_CHECKBOX, self.on_radio, id=button.GetId())
+            self.Bind(wx.EVT_CHECKBOX, self.on_check, id=button.GetId())
             self.buttons.append(button)
             boxsizer.Add(button, 0, 0)
@@ -61 +61 @@
         help_btn.SetToolTipString("Help on the GPU options")
 
-        self.Bind(wx.EVT_BUTTON, self.on_accept, accept_btn)
+        self.Bind(wx.EVT_BUTTON, self.on_OK, accept_btn)
         self.Bind(wx.EVT_BUTTON, self.on_help, help_btn)
-        self.Bind(wx.EVT_CLOSE, self.on_close)
 
         btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -93 +92 @@
         return clinfo
 
-    def on_radio_default(self, event):
-        event.GetEventObject().SetValue(not event.GetEventObject().GetValue())
-
-    def on_radio(self, event):
+    def on_check(self, event):
         """
         Action triggered when button is selected
@@ -102 +98 @@
         :return:
         """
-        import sasmodels
         selected_button = event.GetEventObject()
         for btn in self.buttons:
@@ -108 +103 @@
                 btn.SetValue(0)
         os.environ["SAS_OPENCL"] = self.option_button[selected_button.Name]
+
+    def on_OK(self, event):
+        """
+        Close window on accpetance
+        """
+        import sasmodels
         sasmodels.kernelcl.ENV = None
         #Need to reload sasmodels.core module to account SAS_OPENCL = "None"
         reload(sasmodels.core)
-
-    def on_accept(self, event):
-        """
-        Close window on accpetance
-        """
         event.Skip()
 
@@ -126 +122 @@
         DocumentationWindow(self, -1,
                             TreeLocation, anchor, "OpenCL Options Help")
-
-    def on_close(self, event):
-        """
-        Close window
-        """
-        event.Skip()