Changeset 2872 for trunk/GSASIIphsGUI.py

Timestamp:

Jun 22, 2017 10:24:43 PM (6 years ago)

Author:

toby

Message:

include only added histograms in Phase/Data? operations

File:

• trunk/GSASIIphsGUI.py (modified) (8 diffs)

trunk/GSASIIphsGUI.py

@@ -974 +974 @@
                 
             def OnRefList(event):
+                if not refsList: 
+                    G2G.G2MessageBox(G2frame.dataFrame,'No reflections')
+                    return
                 dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
                     'Use data',refsList)
@@ -5565 +5568 @@
                 TextList.append(name)
             item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)                        
+            if not TextList: 
+                G2G.G2MessageBox(G2frame.dataFrame,'No reflections')
+                return
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
             'Use data',TextList)
@@ -5621 +5627 @@
         UseList = data['Histograms']
         hist = G2frame.hist
-        keyList = G2frame.GetHistogramNames(hist[:4])
+        keyList = sorted(UseList.keys())
         if UseList:
             dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame, 'Use histograms', 
@@ -5652 +5658 @@
         UseList = data['Histograms']
         hist = G2frame.hist
-        keyList = G2frame.GetHistogramNames(hist[:4])[:]
+        keyList = sorted(UseList.keys())
         if hist in keyList: keyList.remove(hist)
         sourceDict = UseList[hist]
@@ -5707 +5713 @@
                 for bab in babNames:
                     copyDict[name][bab] = sourceDict[name][bab][1]                       
-        keyList = G2frame.GetHistogramNames(hist[:4])[:]
+        keyList = sorted(UseList.keys())
         if hist in keyList: keyList.remove(hist)
         if UseList:
@@ -5752 +5758 @@
         UseList = data['Histograms']
         hist = G2frame.hist
-        keyList = G2frame.GetHistogramNames(hist[:4])[:]
+        keyList = sorted(UseList.keys())
         if hist in keyList: keyList.remove(hist)
         sourceDict = UseList[hist]
@@ -5799 +5805 @@
                     TextList.append(name)
                 item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
-            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
+            if not TextList: 
+                G2G.G2MessageBox(G2frame.dataFrame,'No histograms')
+                return
+            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select powder histograms to use',
                     'Use data',TextList)
             try:
@@ -5826 +5835 @@
     def OnDataDelete(event):
         UseList = data['Histograms']
-        keyList = UseList.keys()
+        keyList = sorted(UseList.keys())
         keyList.sort()
         if UseList: