Changeset 3065 for trunk/GSASIIconstrGUI.py

Timestamp:

Sep 11, 2017 3:58:13 PM (5 years ago)

Author:

toby

Message:

fix error introduced by variable sorting

File:

• trunk/GSASIIconstrGUI.py (modified) (3 diffs)

trunk/GSASIIconstrGUI.py

@@ -392 +392 @@
                 l2 = max(l2,len(i2))
             fmt = "{:"+str(l1)+"s} {:"+str(l2)+"s} {:s}"
-            atchoice = G2obj.SortVariables([fmt.format(*i1) for i1 in choices])
+            atchoices = [fmt.format(*i1) for i1 in choices] # reformat list as str with columns
             dlg = G2G.G2MultiChoiceDialog(
                 G2frame,legend,
-                'Constrain '+str(FrstVarb)+' with...',atchoice,
+                'Constrain '+str(FrstVarb)+' with...',atchoices,
                 toggle=False,size=(625,400),monoFont=True)
             dlg.CenterOnParent()
@@ -709 +709 @@
         '''
         #varListlbl = ["("+i+") "+G2obj.fmtVarDescr(i) for i in varList]
+        if constType == 'equivalence':
+            omitVars = G2mv.GetDependentVars()
+        else:
+            omitVars = []
+        varList = G2obj.SortVariables([i for i in varList if i not in omitVars])
         l2 = l1 = 1
         for i in varList:
@@ -715 +720 @@
             l2 = max(l2,len(loc))
         fmt = "{:"+str(l1)+"s} {:"+str(l2)+"s} {:s}"
-        if constType == 'equivalence':
-            omitVars = G2mv.GetDependentVars()
-        else:
-            omitVars = []
-        varList = G2obj.SortVariables([i for i in varList if i not in omitVars])
         varListlbl = [fmt.format(i,*G2obj.VarDescr(i)) for i in varList]
         dlg = G2G.G2SingleChoiceDialog(G2frame,'Select 1st variable:',