Changeset 2749

Timestamp:

Mar 7, 2017 3:56:24 PM (6 years ago)

Author:

vondreele

Message:

fix issues with HKLF reflection displays

File:

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

trunk/GSASIIpwdGUI.py

@@ -3488 +3488 @@
                         
                                                   
-        if not len(data[phaseName]):
+        if not HKLF and not len(data[phaseName]):
             return          #deleted phase?
         G2frame.RefList = phaseName
@@ -3511 +3511 @@
             G2frame.refTable[phaseName].AutoSizeColumns(False)
             setBackgroundColors(im,itof)
-#        GSASIIpath.IPyBreak()
-        refList = np.array([refl[:6+im] for refl in data[phaseName]['RefList']])
+        if HKLF:
+            refList = np.array([refl[:6+im] for refl in data[1]['RefList']])
+        else:
+            refList = np.array([refl[:6+im] for refl in data[phaseName]['RefList']])
         G2frame.HKL = np.vstack((refList.T)).T    #build for plots
         # raise the tab (needed for 1st use and from OnSelectPhase)
@@ -3578 +3580 @@
     G2frame.dataFrame.currentGrids = []
     for tabnum,phase in enumerate(phases):
-        if len(data[phase]):
+        if isinstance(data,list):           #single crystal HKLF
+            G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.dataDisplay)
+            G2frame.dataDisplay.AddPage(G2frame.refTable[phase],phase)
+        elif len(data[phase]):              #else dict for PWDR
             G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.dataDisplay)
             G2frame.dataDisplay.AddPage(G2frame.refTable[phase],phase)