Changeset 1413

Timestamp:

Jul 6, 2014 12:53:47 PM (9 years ago)

Author:

toby

Message:

Add config support; default expressions

Location:

trunk

Files:

• DefaultExpressions.txt (added)
• GSASII.py (modified) (1 diff)
• GSASIIElem.py (modified) (1 diff)
• GSASIIexprGUI.py (modified) (8 diffs)
• GSASIIpath.py (modified) (1 diff)

trunk/GSASII.py

@@ -56 +56 @@
     install_with_easyinstall('PyOpenGl')
     print('*******************************************************')         
-    print('OpenGL has been installed. Please restart GSAS-II')
+    print('OpenGL has been installed. Restarting GSAS-II')
     print('*******************************************************')         
+    loc = os.path.dirname(__file__)
+    subprocess.Popen([sys.executable,os.path.join(loc,'GSASII.py')])
     sys.exit()
     

trunk/GSASIIElem.py

@@ -205 +205 @@
         xsec = open(filename,'Ur')
     except:
-        print '**** ERROR - File Xsect.dat not found in directory %s' % sys.path[0]
+        print '**** ERROR - File Xsect.dat not found in directory %s' % os.path.split(filename)[0]
         sys.exit()
     S = '1'

trunk/GSASIIexprGUI.py

@@ -19 +19 @@
 the user is asked to assign parameters from the dictionary to each variable.
 
+Default expressions are read from file DefaultExpressions.txt using
+:func:`GSASIIpath.LoadConfigFile`.
+
 '''
 import re
 import sys
 import wx
+import os.path
 import wx.lib.scrolledpanel as wxscroll
 import numpy as np
+import GSASIIpath
+GSASIIpath.SetVersionNumber("$Revision$")
 import GSASIIgrid as G2gd
 import GSASIIpy3 as G2py3
@@ -60 +66 @@
     return parmLists
 
+#==========================================================================
+defaultExpressions = None
+def LoadDefaultExpressions():
+    '''Read a configuration file with default expressions from all files named
+    DefaultExpressions.txt found in the path. Duplicates are removed and
+    expressions are sorted alphabetically
+    '''
+    global defaultExpressions
+    if defaultExpressions is not None: return # run this routine only once
+    defaultExpressions = sorted(list(set(GSASIIpath.LoadConfigFile('DefaultExpressions.txt'))))
+    
 #==========================================================================
 class ExpressionDialog(wx.Dialog):
@@ -148 +165 @@
         self.usedVars = usedVars
         'variable names that have been used and should not be reused by default'
+        defSize = (620,340) # seems like a good size
+        'Starting size for dialog'
 
         # process dictionary of values and create an index
@@ -164 +183 @@
         self.timer = wx.Timer()
         self.timer.Bind(wx.EVT_TIMER,self.OnValidate)
-
+        LoadDefaultExpressions()
         style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER
-        wx.Dialog.__init__(self, parent, wx.ID_ANY, wintitle, style=style)
+        wx.Dialog.__init__(self, parent, wx.ID_ANY, wintitle, style=style, size=defSize)
         self.mainsizer = wx.BoxSizer(wx.VERTICAL)
         label = wx.StaticText(self,  wx.ID_ANY, header)
@@ -194 +213 @@
             self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
 
-        self.exCtrl = wx.TextCtrl(self,  wx.ID_ANY, size=(150,-1),style=wx.TE_PROCESS_ENTER)
+        #self.exCtrl = wx.TextCtrl(self,  wx.ID_ANY, size=(150,-1),style=wx.TE_PROCESS_ENTER)
+        self.exCtrl = wx.ComboBox(self, wx.ID_ANY, "", (90, 50), (160, -1),
+                                  defaultExpressions,
+                                  wx.CB_DROPDOWN| wx.TE_PROCESS_ENTER
+                         )
         self.exCtrl.Bind(wx.EVT_CHAR, self.OnChar)
+        self.exCtrl.Bind(wx.EVT_COMBOBOX, self.OnValidate)
         self.exCtrl.Bind(wx.EVT_TEXT_ENTER, self.OnValidate)
         self.exsizer.Add(self.exCtrl, 1, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 0)
@@ -253 +277 @@
         self.exCtrl.SetValue(self.expr)
         self.OnValidate(None)
-        self.SetMinSize((620,300)) # seems like a good size
+        self.SetMinSize(defSize) 
         #self.errbox.SetAutoLayout(1)
         #self.errbox.SetupScrolling()
@@ -288 +312 @@
         '''
         self.Layout()
-        self.mainsizer.Fit(self)
+        #self.mainsizer.Fit(self)
         self.SendSizeEvent() # force repaint
         if self.ShowModal() == wx.ID_OK:
@@ -483 +507 @@
         self.varbox.Refresh()
         self.Layout()
-        self.mainsizer.Fit(self)
+        #self.mainsizer.Fit(self)
         self.SendSizeEvent() # force repaint
         return

trunk/GSASIIpath.py

@@ -83 +83 @@
     return version
 
+def LoadConfigFile(filename):
+    '''Read a GSAS-II configuration file.
+    Comments (starting with "%") are removed, as are empty lines
+    
+    :param str filename: base file name (such as 'file.dat'). Files with this name
+      are located from the path and the contents of each are concatenated.
+    :returns: a list containing each non-empty (after removal of comments) line
+      found in every matching config file.
+    '''
+    info = []
+    for path in sys.path:
+        fil = os.path.join(path,filename)
+        if not os.path.exists(fil): continue
+        try:
+            i = 0
+            fp = open(fil,'r')
+            for line in fp:
+                expr = line.split('#')[0].strip()
+                if expr:
+                    info.append(expr)
+                    i += 1
+            print(str(i)+' lines read from config file '+fil)
+        finally:
+            fp.close()
+    return info
+
+
 # routines to interface with subversion
 def whichsvn():