Changeset 810

Timestamp:

Dec 5, 2012 3:38:26 PM (10 years ago)

Author:

vondreele

Message:

add 'all' in constraint editing for histogram selection

File:

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

trunk/GSASIIgrid.py

@@ -1441 +1441 @@
     def FindEquivVarb(name,nameList):
         outList = []
-        namelist = [name.split(':')[2],]
+        phlist = []
+        items = name.split(':')
+        namelist = [items[2],]
         if 'dA' in name:
             namelist = ['dAx','dAy','dAz']
@@ -1447 +1449 @@
             namelist = ['AUiso','AU11','AU22','AU33','AU12','AU13','AU23']
         for item in nameList:
-            key = item.split(':')[2]
-            if key in namelist and item != name:
+            keys = item.split(':')
+            if keys[0] not in phlist:
+                phlist.append(keys[0])
+            if keys[2] in namelist and item != name:
                 outList.append(item)
+        if items[1]:
+            for key in phlist:
+                outList.append(key+':all:'+items[2])
         return outList
         
@@ -1474 +1481 @@
             try:
                 for x in sel:
-                    varbs.append(varList[x])
+                    if ':all:' in varList[x]:       #a histogram 'all' - supercedes any individual selection
+                        varbs = [FrstVarb,]
+                        items = varList[x].split(':')
+                        for item in varList:
+                            if items[0] == item.split(':')[0]:
+                                varbs.append(item)
+                        break
+                    else:
+                        varbs.append(varList[x])
             except IndexError:      # one of the 'all' chosen - supercedes any individual selection
                 varbs = [FrstVarb,]