Changeset 1511 for branch

Timestamp:

Oct 1, 2014 7:12:29 PM (9 years ago)

Author:

toby

Message:

add config file support

Location:

branch/logging

Files:

• GSASIIlog.py (modified) (4 diffs)
• GSASIIpath.py (modified) (1 diff)
• config.py.example (added)

branch/logging/GSASIIlog.py

@@ -13 +13 @@
 import wx
 import GSASIIgrid as G2gd
+import GSASIIpath
+# Global variables 
 MenuBindingLookup = {}
 'Lookup table for Menu buttons'
@@ -20 +22 @@
 'Contains a list of logged actions; first item is ignored'
 LogInfo = {'Logging':False, 'Tree':None, 'LastPaintAction':None}
-'Contains a dict with values that are needed in the module'
+'Contains values that are needed in the module for past actions & object location'
 
 # TODO:
@@ -34 +36 @@
 #   and then a LogCall('unique-string',pargs,kwargs) call inside the routine
 
-debug = True
+debug = GSASIIpath.GetConfigValue('logging_debug')
 #===========================================================================
 # objects for logging variables
@@ -541 +543 @@
     return
 
-LogOn() # for debug
+if debug: LogOn() # for debug, start with logging enabled

branch/logging/GSASIIpath.py

@@ -60 +60 @@
 if newpath not in sys.path: sys.path.append(newpath)
 
+# setup read of config.py, if present
+try:
+    import config
+    configDict = config.__dict__
+    import inspect
+    vals = [True for i in inspect.getmembers(config) if '__' not in i[0]]
+    print str(len(vals))+' values read from config file '+os.path.abspath(config.__file__)
+except ImportError:
+    configDict = {}
+    
+def GetConfigValue(key):
+    'Return the configuration file value for key or None if not present'
+    return configDict.get(key)
+
 # routines for looking a version numbers in files
 version = -1