Changeset 1294

Timestamp:

Apr 21, 2014 3:38:39 PM (9 years ago)

Author:

toby

Message:

fix pseudo var bugs

Location:

trunk

Files:

• GSASIIexprGUI.py (modified) (3 diffs)
• GSASIIobj.py (modified) (1 diff)

trunk/GSASIIexprGUI.py

@@ -414 +414 @@
             self.varValue[v] = self.varValue.get(v,0.0)
         else:
-            var = self.SelectG2var(sel)
+            var = self.SelectG2var(sel,v)
             if not var:
                 del self.varSelect[v]
@@ -424 +424 @@
         self.OnValidate(None)
 
-    def SelectG2var(self,sel):
+    def SelectG2var(self,sel,var):
         '''Offer a selection of a GSAS-II variable. 
 
@@ -444 +444 @@
         varListlbl = [fmt.format(i,*G2obj.VarDescr(i)) for i in self.parmLists[sel]]
 
-        dlg = G2gd.G2SingleChoiceDialog(self,'Select GSAS-II variable:','Select variable',
-                                        varListlbl,monoFont=True)
+        dlg = G2gd.G2SingleChoiceDialog(
+            self,'Select GSAS-II variable for '+str(var)+':',
+            'Select variable',
+            varListlbl,monoFont=True)
         dlg.SetSize((625,250))
         dlg.CenterOnParent()

trunk/GSASIIobj.py

@@ -1855 +1855 @@
             try: # check if values are in lists
                 val = parmDict[key][0]
-            except TypeError:
+            except (TypeError,IndexError):
                 parmsInList = False
             break