Changeset 1294


Ignore:
Timestamp:
Apr 21, 2014 3:38:39 PM (8 years ago)
Author:
toby
Message:

fix pseudo var bugs

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIexprGUI.py

    r1287 r1294  
    414414            self.varValue[v] = self.varValue.get(v,0.0)
    415415        else:
    416             var = self.SelectG2var(sel)
     416            var = self.SelectG2var(sel,v)
    417417            if not var:
    418418                del self.varSelect[v]
     
    424424        self.OnValidate(None)
    425425
    426     def SelectG2var(self,sel):
     426    def SelectG2var(self,sel,var):
    427427        '''Offer a selection of a GSAS-II variable.
    428428
     
    444444        varListlbl = [fmt.format(i,*G2obj.VarDescr(i)) for i in self.parmLists[sel]]
    445445
    446         dlg = G2gd.G2SingleChoiceDialog(self,'Select GSAS-II variable:','Select variable',
    447                                         varListlbl,monoFont=True)
     446        dlg = G2gd.G2SingleChoiceDialog(
     447            self,'Select GSAS-II variable for '+str(var)+':',
     448            'Select variable',
     449            varListlbl,monoFont=True)
    448450        dlg.SetSize((625,250))
    449451        dlg.CenterOnParent()
  • trunk/GSASIIobj.py

    r1287 r1294  
    18551855            try: # check if values are in lists
    18561856                val = parmDict[key][0]
    1857             except TypeError:
     1857            except (TypeError,IndexError):
    18581858                parmsInList = False
    18591859            break
Note: See TracChangeset for help on using the changeset viewer.