Changeset 1933 for trunk/GSASIIpwdGUI.py

Timestamp:

Jul 17, 2015 11:37:24 AM (7 years ago)

Author:

vondreele

Message:

remove old reflection style patches in G2phsGUI & G2plot
fix hkl & hklm tool tip display for powder data
fix drag of difference curve & hkl tic marks

File:

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

trunk/GSASIIpwdGUI.py

@@ -2299 +2299 @@
                 maxH = ssopt['maxH']
                 G2frame.HKL = G2pwd.getHKLMpeak(dmin,Inst,SGData,SSGData,Vec,maxH,A)
+                G2frame.HKL = np.array(G2frame.HKL)
                 data[0] = G2indx.IndexSSPeaks(data[0],G2frame.HKL)[1]
             else:        #select cell from table - no SS
@@ -2308 +2309 @@
                         for hkl in G2frame.HKL:
                             hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3]))
+                        G2frame.HKL = np.array(G2frame.HKL)
                         data[0] = G2indx.IndexPeaks(data[0],G2frame.HKL)[1]
                         break
@@ -2598 +2600 @@
                 M20 = X20 = 0.
                 G2frame.HKL = G2pwd.getHKLpeak(dmin,SGData,A,Inst)
+        G2frame.HKL = np.array(G2frame.HKL)
         if len(G2frame.HKL):
             print ' new M20,X20: %.2f %d fraction found: %.3f'%(M20,X20,float(len(peaks[0]))/len(G2frame.HKL))
@@ -2685 +2688 @@
             peaks = [G2indx.IndexPeaks(peaks[0],G2frame.HKL)[1],peaks[1]]   #put peak fit esds back in peaks
             Lhkl,M20,X20,Aref,Zero = G2indx.refinePeaksT(peaks[0],difC,ibrav,A,controls[1],controls[0])            
+        G2frame.HKL = np.array(G2frame.HKL)
         controls[1] = Zero
         controls[6:12] = G2lat.A2cell(Aref)
@@ -2708 +2712 @@
         for hkl in G2frame.HKL:
             hkl[ip] = G2lat.Dsp2pos(Inst,hkl[ip-1])+controls[1]
+        G2frame.HKL = np.array(G2frame.HKL)
         if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
             G2plt.PlotPowderLines(G2frame)
@@ -2755 +2760 @@
                 for hkl in G2frame.HKL:
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
+                G2frame.HKL = np.array(G2frame.HKL)
                 if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
                     G2plt.PlotPowderLines(G2frame)
@@ -2782 +2788 @@
                 for hkl in G2frame.HKL:
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
+                G2frame.HKL = np.array(G2frame.HKL)
                 if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
                     G2plt.PlotPowderLines(G2frame)
@@ -3030 +3037 @@
                 for hkl in G2frame.HKL:
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
+                G2frame.HKL = np.array(G2frame.HKL)
             table.append(row)
         UnitCellsTable = G2G.Table(table,rowLabels=rowLabels,colLabels=colLabels,types=Types)
@@ -3150 +3158 @@
             elif 'T' in Inst['Type'][0]:
                 refs = np.vstack((refList.T[:18+Super],I100)).T
-        for i in range(len(refs)): rowLabels.append(str(i))
+            G2frame.HKL = np.vstack((refList.T[:6+Super])).T    #build for plots
+        rowLabels = [str(i) for i in range(len(refs))]
         Types = (4+Super)*[wg.GRID_VALUE_LONG,]+4*[wg.GRID_VALUE_FLOAT+':10,4',]+ \
             2*[wg.GRID_VALUE_FLOAT+':10,2',]+[wg.GRID_VALUE_FLOAT+':10,3',]+ \