Changeset 1202

Timestamp:

Jan 20, 2014 12:24:54 PM (11 years ago)

Author:

toby

Message:

further refinements on ValidatedTxtCtrl?; update G2VarObj to allow wildcard variables (*::dAx:1 or 1::dAx:*)

Location:

trunk

Files:

• GSASIIgrid.py (modified) (5 diffs)
• GSASIIobj.py (modified) (5 diffs)

trunk/GSASIIgrid.py ¶

@@ -224 +224 @@
       use of a single '?' or '.' character as valid input.
 
+    :param dict OnLeaveArgs: a dict with keyword args that are passed to
+      the :attr:`OnLeave` function. Defaults to ``{}``
+
     :param (other): other optional keyword parameters for the
       wx.TextCtrl widget such as Size or Style may be specified.
@@ -230 +233 @@
     def __init__(self,parent,loc,key,nDig=None,notBlank=True,min=None,max=None,
                  OKcontrol=None,OnLeave=None,typeHint=None,
-                 CIFinput=False, **kw):
+                 CIFinput=False, OnLeaveArgs={}, **kw):
         # save passed values needed outside __init__
         self.result = loc
@@ -237 +240 @@
         self.OKcontrol=OKcontrol
         self.OnLeave = OnLeave
+        self.OnLeaveArgs = OnLeaveArgs
         self.CIFinput = CIFinput
         self.type = str
@@ -295 +299 @@
         # When the mouse is moved away or the widget loses focus
         # display the last saved value, if an expression
-#        self.Bind(wx.EVT_LEAVE_WINDOW, self._onLoseFocus)
+        self.Bind(wx.EVT_LEAVE_WINDOW, self._onLeaveWindow)
         self.Bind(wx.EVT_TEXT_ENTER, self._onLoseFocus)
         self.Bind(wx.EVT_KILL_FOCUS, self._onLoseFocus)
@@ -396 +400 @@
         if self.OnLeave: self.OnLeave(invalid=self.invalid,
                                       value=self.result[self.key],
-                                      tc=self)
-            
+                                      tc=self,
+                                      **self.OnLeaveArgs)
+
+    def _onLeaveWindow(self,event):
+        if self.evaluated: self.EvaluateExpression()
+
     def EvaluateExpression(self):
         '''Show the computed value when an expression is entered to the TextCtrl

trunk/GSASIIobj.py ¶

@@ -1251 +1251 @@
     if key is None:
         return ""
+    elif key == "*":
+        return "*"
     else:
         return dic.get(key,'?')
@@ -1266 +1268 @@
       object. If a string, it must be of form "p:h:var" or "p:h:var:a", where
 
-     * p is the phase number (which may be left blank); 
-     * h is the histogram number (which may be left blank); 
+     * p is the phase number (which may be left blank or may be '*' to indicate all phases); 
+     * h is the histogram number (which may be left blank or may be '*' to indicate all histograms); 
      * a is the atom number (which may be left blank in which case the third colon is omitted).
+       The atom number can be specified as '*' if a phase number is specified (not as '*')
 
       Alternately a single tuple of form (Phase,Histogram,VarName,AtomID) can be used, where
-      Phase, Histogram, and AtomID are None or are ranId values and VarName is a string.     
+      Phase, Histogram, and AtomID are None or are ranId values (or one can be '*')
+      and VarName is a string. Note that if Phase is '*' then the AtomID is an atom number.
 
     If four positional arguments are supplied, they are:
 
-    :param str/int phasenum: The number for the phase
-    :param str/int histnum: The number for the histogram
+    :param str/int phasenum: The number for the phase (or None or '*')
+    :param str/int histnum: The number for the histogram (or None or '*')
     :param str varname: a single value can be used to create a :class:`G2VarObj`
-    :param str/int atomnum: The number for the atom
+    :param str/int atomnum: The number for the atom (or None or '*')
     
     '''
@@ -1294 +1298 @@
         elif len(args) == 1 and ':' in args[0]:            
             lst = args[0].split(':')
-            self.phase = PhaseIdLookup.get(lst[0],[None,None])[1]
-            self.histogram = HistIdLookup.get(lst[1],[None,None])[1]
+            if lst[0] == '*':
+                self.phase = '*'
+                if len(lst) > 3:
+                    self.atom = lst[3]
+            else:
+                self.phase = PhaseIdLookup.get(lst[0],[None,None])[1]
+                if len(lst) > 3:
+                    if lst[3] == '*':
+                        self.atom = '*'
+                    else:
+                        self.atom = AtomIdLookup[lst[0]].get(lst[3],[None,None])[1]
+
+            if lst[1] == '*':
+                self.histogram = '*'
+            else:
+                self.histogram = HistIdLookup.get(lst[1],[None,None])[1]
             self.name = lst[2]
-            if len(lst) > 3:
-                self.atom = AtomIdLookup[lst[0]].get(lst[3],[None,None])[1]
         elif len(args) == 4:
-            self.phase = PhaseIdLookup.get(str(args[0]),[None,None])[1]
-            self.histogram = HistIdLookup.get(str(args[1]),[None,None])[1]
+            if args[0] == '*':
+                self.phase = '*'
+                self.atom = args[3]
+            else:
+                self.phase = PhaseIdLookup.get(str(args[0]),[None,None])[1]
+                if args[3] == '*':
+                    self.atom = '*'
+                elif args[0] is not None:
+                    self.atom = AtomIdLookup[args[0]].get(str(args[3]),[None,None])[1]
+            if args[1] == '*':
+                self.histogram = '*'
+            else:
+                self.histogram = HistIdLookup.get(str(args[1]),[None,None])[1]
             self.name = args[2]
-            self.atom = AtomIdLookup[args[0]].get(str(args[3]),[None,None])[1]
         else:
             raise Exception,"Incorrectly called GSAS-II parameter name"
@@ -1318 +1344 @@
         :returns: the variable name as a str
         '''
-        ph = _lookup(PhaseRanIdLookup,self.phase)
-        hist = _lookup(HistRanIdLookup,self.histogram)
-        s = (ph + ":" + hist + ":" + 
-             str(self.name))
-        if self.atom:
-            if ph in AtomRanIdLookup:
-                s += ":" + AtomRanIdLookup[ph].get(self.atom,'?')
-            else:
-                s += ":?"
+        a = ""
+        if self.phase == "*":
+            ph = "*"
+            if self.atom:
+                a = ":" + str(self.atom)
+        else:
+            ph = _lookup(PhaseRanIdLookup,self.phase)
+            if self.atom == '*':
+                a = ':*'
+            elif self.atom:
+                if ph in AtomRanIdLookup:
+                    a = ":" + AtomRanIdLookup[ph].get(self.atom,'?')
+                else:
+                    a = ":?"
+        if self.histogram == "*":
+            hist = "*"
+        else:
+            hist = _lookup(HistRanIdLookup,self.histogram)
+        s = (ph + ":" + hist + ":" + str(self.name)) + a
         return s
     
@@ -1333 +1369 @@
         '''
         s = "<"
-        if self.phase is not None:
+        if self.phase == '*':
+            s += "Phases: all; "
+            if self.atom is not None:
+                s += "Atom #" + str(self.atom) + "; "
+        elif self.phase is not None:
             ph =  _lookup(PhaseRanIdLookup,self.phase)
             s += "Phase: rId=" + str(self.phase) + " (#"+ ph + "); "
-        if self.histogram is not None:
+            if self.atom == '*':
+                s += "Atoms: all; "
+            elif self.atom is not None:
+                s += "Atom rId=" + str(self.atom)
+                if ph in AtomRanIdLookup:
+                    s += " (#" + AtomRanIdLookup[ph].get(self.atom,'?') + "); "
+                else:
+                    s += " (#? -- not found!); "
+        if self.histogram == '*':
+            s += "Histograms: all; "
+        elif self.histogram is not None:
             hist = _lookup(HistRanIdLookup,self.histogram)
             s += "Histogram: rId=" + str(self.histogram) + " (#"+ hist + "); "
-        if self.atom is not None:
-            s += "Atom rId=" + str(self.atom)
-            if ph in AtomRanIdLookup:
-                s += " (#" + AtomRanIdLookup[ph].get(self.atom,'?') + "); "
-            else:
-                s += " (#? -- not found!); "
         s += 'Variable name="' + str(self.name) + '">'
-        return s+"("+self.varname()+")"
+        return s+" ("+self.varname()+")"
 
     def __eq__(self, other):