Changeset 2a1b92eb in sasview

Timestamp:

Jan 4, 2017 8:19:24 AM (8 years ago)

Author:

wojciech

Children:

c85679b

Parents:

25594ca

Message:

Writting to configuration file at the end of session

Location:

src/sas/sasgui

Files:

• guiframe/gui_manager.py (modified) (1 diff)
• guiframe/startup_configuration.py (modified) (1 diff)
• perspectives/fitting/gpu_options.py (modified) (7 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -2109 +2109 @@
         Quit the application
         """
+        #IF SAS_OPENCL is set, settings are stored in the custom config file
+        if "SAS_OPENCL" in os.environ:
+            self._write_opencl_config_file()
         logging.info(" --- SasView session was closed --- \n")
         wx.Exit()
         sys.exit()
+
+    def _write_opencl_config_file(self):
+        #from sas.sasgui.guiframe.customdir import SetupCustom
+        #from sas.sasgui.guiframe.gui_manager import _find_local_config
+
+        sas_opencl = os.environ.get("SAS_OPENCL","")
+        #How to store it in file
+        new_config_lines = []
+        config_file = open(custom_config.__file__)
+        if custom_config is not None:
+            config_lines = config_file.readlines()
+            for line in config_lines:
+                if "SAS_OPENCL" in line:
+                    if sas_opencl:
+                        new_config_lines.append("SAS_OPENCL = \""+sas_opencl+"\"")
+                    else:
+                        new_config_lines.append("SAS_OPENCL = None")
+                else:
+                    new_config_lines.append(line)
+        config_file.close()
+        new_config_file = open(custom_config.__file__,"w")
+        new_config_file.writelines(new_config_lines)
+        new_config_file.close()
+
 
     def _check_update(self, event=None):

src/sas/sasgui/guiframe/startup_configuration.py

@@ -46 +46 @@
                        'CLEANUP_PLOT':CURRENT.CLEANUP_PLOT,
                        'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE,
-                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER,
+                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDE,
                        'SAS_OPENCL': None}
 except:

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

@@ -18 +18 @@
 class CustomMessageBox(wx.Dialog):
     def __init__(self, parent, msg, title):
+
         wx.Dialog.__init__(self, parent, title=title)
-        text = wx.TextCtrl(self, style=wx.TE_READONLY|wx.BORDER_NONE)
+
+        panel = wx.Panel(self, -1)
+        static_box = wx.StaticBox(panel, -1, "OpenCL test completed!")
+        boxsizer = wx.BoxSizer(orient=wx.VERTICAL)
+
+        text = wx.TextCtrl(self, style=wx.TE_READONLY|wx.TE_MULTILINE
+                                       |wx.BORDER_NONE, size=(400,200))
         text.SetValue(msg)
         text.SetBackgroundColour(self.GetBackgroundColour())
+
+        boxsizer.Add(text, 0)
+
+        fit_hsizer = wx.StaticBoxSizer(static_box, orient=wx.VERTICAL)
+        fit_hsizer.Add(boxsizer, 0, wx.ALL, 5)
+
+        panel.SetSizer(fit_hsizer)
+
+        vbox = wx.BoxSizer(wx.VERTICAL)
+        vbox.Add(panel, 0, wx.ALL, 10)
+
+        ok_btn = wx.Button(self, wx.ID_OK)
+
+        btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        btn_sizer.Add((10, 20), 1) # stretchable whitespace
+        btn_sizer.Add(ok_btn, 0)
+
+        vbox.Add(btn_sizer, 0, wx.EXPAND|wx.ALL, 10)
+
+        self.SetSizer(vbox)
+        vbox.Fit(self)
+
+        self.Centre()
         self.ShowModal()
         self.Destroy()
@@ -50 +80 @@
         #Check if SAS_OPENCL is already set as enviromental variable
         self.sas_opencl = os.environ.get("SAS_OPENCL","")
-        #self.sas_opencl =  os.environ["SAS_OPENCL"] \
-        #    if "SAS_OPENCL" in os.environ else SAS_OPENCL_CUSTOM
+        print("SAS_OPENCL: ",self.sas_opencl)
 
         for clopt in clinfo:
@@ -148 +177 @@
         return clinfo
 
-
+    #TODO: Dont want to mess with writting to configuration file before end of
     def _write_to_config_file(self):
         from sas.sasgui.guiframe.customdir import SetupCustom
@@ -183 +212 @@
     def on_check(self, event):
         """
-        Action triggered when button is selected
+        Action triggered when box is selected
         :param event:
         :return:
@@ -207 +236 @@
             if "SAS_OPENCL" in os.environ:
                 del(os.environ["SAS_OPENCL"])
-        try:
-            imp.find_module('sasmodels.kernelcl')
-            kernelcl_exist = True
-        except:
-            kernelcl_exist = False
-        if kernelcl_exist:
-            sasmodels.kernelcl.ENV = None
-
-        self._write_to_config_file()
+        sasmodels.kernelcl.ENV = None
         #Need to reload sasmodels.core module to account SAS_OPENCL = "None"
         reload(sasmodels.core)
@@ -224 +245 @@
         Close window on accpetance
         """
-        import sasmodels
         for btn in self.buttons:
             btn.SetValue(0)
 
         self.sas_opencl=None
-        del(os.environ["SAS_OPENCL"])
-
-        try:
-            imp.find_module('sasmodels.kernelcl')
-            kernelcl_exist = True
-        except:
-            kernelcl_exist = False
-        if kernelcl_exist:
-            sasmodels.kernelcl.ENV = None
-
-        self._write_to_config_file()
-        reload(sasmodels.core)
-        event.Skip()
 
     def on_test(self, event):
@@ -279 +286 @@
 
         msg_info = "OpenCL tests"
-        msg = "OpenCL test completed!\n"
-        msg += "Sasmodels version: "
-        msg += info['version']+"\n"
-        msg += "Platform used: "
-        msg += json.dumps(info['platform'])+"\n"
-        msg += "OpenCL driver: "
-        msg += json.dumps(info['opencl'])+"\n"
+
+        msg = "Results: "
         if len(failures) > 0:
             msg += 'Failing tests:\n'
             msg += json.dumps(info['failing tests'])
         else:
-            msg+="All tests passed\n"
+            msg+="All tests passed!\n"
+
+        msg +="\nDetails:\n"
+        msg += "Sasmodels version: "
+        msg += info['version']+"\n"
+        msg += "\nPlatform used: "
+        msg += json.dumps(info['platform'])+"\n"
+        msg += "\nOpenCL driver: "
+        msg += json.dumps(info['opencl'])+"\n"
 
         CustomMessageBox(self.panel1, msg, msg_info)