Changeset 6af411b in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Dec 21, 2016 10:39:58 AM (8 years ago)

Author:

wojciech

Children:

62243ae

Parents:

bd55e15

Message:

Towards saving in comnfig file

File:

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

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

@@ -11 +11 @@
 import warnings
 import wx
-
+import logging
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
@@ -25 +25 @@
     def __init__(self, *args, **kwds):
 
+        from sas.sasgui.guiframe.customdir import SetupCustom
+
+        c_conf_dir = SetupCustom().setup_dir(PATH_APP)
+        self.custom_config = _find_local_config('custom_config', c_conf_dir)
+        if self.custom_config is None:
+            self.custom_config = _find_local_config('custom_config', os.getcwd())
+            if self.custom_config is None:
+                msgConfig = "Custom_config file was not imported"
+                logging.info(msgConfig)
+            else:
+                logging.info("using custom_config in %s" % os.getcwd())
+        else:
+            logging.info("using custom_config from %s" % c_conf_dir)
+        SAS_OPENCL_CUSTOM = custom_config.SAS_OPENCL
+
         kwds["style"] = wx.DEFAULT_DIALOG_STYLE
         wx.Dialog.__init__(self, *args, **kwds)
@@ -36 +51 @@
         self.option_button = {}
         self.buttons = []
-        #Check if SAS_OPENCL is already set
-        self.sas_opencl = os.environ.get("SAS_OPENCL","")
+        #Check if SAS_OPENCL is already set as enviromental variable
+        self.sas_opencl =  os.environ["SAS_OPENCL"] \
+            if "SAS_OPENCL" in os.environ else SAS_OPENCL_CUSTOM
+        #or as a custom variable in the config file
+
         for clopt in clinfo:
             button = wx.CheckBox(self.panel1, -1, label=clopt[1], name=clopt[1])
@@ -156 +174 @@
         if self.sas_opencl:
             os.environ["SAS_OPENCL"] = self.sas_opencl
-        else:
+            else:
             if "SAS_OPENCL" in os.environ:
                 del(os.environ["SAS_OPENCL"])
         sasmodels.kernelcl.ENV = None
+        #TODO: Write to config.py
+        self.custom_config.SAS_OPENCL = self.sas_opencl
+
         #Need to reload sasmodels.core module to account SAS_OPENCL = "None"
         reload(sasmodels.core)