Changeset 4084 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Aug 9, 2019 9:34:13 AM (2 years ago)
Author:
vondreele
Message:

fixes to SHAPES results table
fix remaining plot amnesia problems

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r4081 r4084  
    56585658        def OnShapeSelect(event):
    56595659            r,c =  event.GetRow(),event.GetCol()
    5660             shapeTable.SetValue(r,c,False)
     5660            for i in [1,2]:
     5661                for j in range(len(Patterns)):
     5662                    shapeTable.SetValue(j,i,False)
     5663            shapeTable.SetValue(r,c,True)
     5664            ShapesResult.ForceRefresh()
    56615665            selAtoms = Atoms[2*r+(c-1)]
    56625666            pattern = Patterns[r]
    5663             PRvals = PRcalc[r]
     5667            data['Pair']['Pair Calc'] = np.array([PRcalc[r][0],PRcalc[r][2]]).T
    56645668            print('%s %d'%('num. beads',len(selAtoms[1])))
    56655669            print('%s %.3f'%('selected r value',pattern[-1]))
    5666             print('%s %.3f'%('selected Delta P(r)',PRvals[-1]))
     5670            print('%s %.3f'%('selected Delta P(r)',PRcalc[r][-1]))
    56675671            G2plt.PlotSASDPairDist(G2frame)
    56685672            RefreshPlots(True)
     
    57195723            tableVals = []
    57205724            for i in range(len(Patterns)):
    5721                 tableVals.append([Atoms[2*i][0],False,False,Patterns[i][-1],PRcalc[i][-1],len(Atoms[2*1][1]),len(Atoms[2*i+1][1])])
     5725                tableVals.append([Atoms[2*i][0],False,False,Patterns[i][-1],PRcalc[i][-1],len(Atoms[2*i][1]),len(Atoms[2*i+1][1])])
    57225726            shapeTable = G2G.Table(tableVals,rowLabels=rowLabels,colLabels=colLabels,types=Types)
    57235727            ShapesResult = G2G.GSGrid(G2frame.dataWindow)
    57245728            ShapesResult.SetTable(shapeTable,True)
    57255729            ShapesResult.AutoSizeColumns(False)
    5726             ShapesResult.Bind(wg.EVT_GRID_CELL_CHANGED, OnShapeSelect)
     5730            ShapesResult.Bind(wg.EVT_GRID_CELL_LEFT_CLICK, OnShapeSelect)
    57275731            for r in range(len(Patterns)):
    57285732                for c in range(7):
Note: See TracChangeset for help on using the changeset viewer.