Changeset 2578


Ignore:
Timestamp:
Dec 13, 2016 10:05:57 AM (5 years ago)
Author:
vondreele
Message:

fix map/peaks roll problem - roll wasn't retained

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r2577 r2578  
    51605160               
    51615161    def SetMapPeaksText(mapPeaks):
     5162        data['Map Peaks'] = mapPeaks
    51625163        page = getSelection()
    51635164        if page:
    51645165            if G2frame.dataDisplay.GetPageText(page) == 'Map peaks':
    5165                 G2frame.MapPeaksTable.SetData(mapPeaks)
     5166                G2frame.MapPeaksTable.SetData(data['Map Peaks'])
    51665167                panel = G2frame.dataDisplay.GetPage(page).GetChildren()
    51675168                names = [child.GetName() for child in panel]
     
    52465247               
    52475248    def SetMapRoll(newxy):
    5248         rho = mapData['rho']
     5249        rho = generalData['Map']['rho']
    52495250        roll = GetRoll(newxy,rho.shape)
    5250         mapData['rho'] = np.roll(np.roll(np.roll(rho,roll[0],axis=0),roll[1],axis=1),roll[2],axis=2)
     5251        generalData['Map']['rho'] = np.roll(np.roll(np.roll(rho,roll[0],axis=0),roll[1],axis=1),roll[2],axis=2)
    52515252        drawingData['oldxy'] = list(newxy)
    52525253       
     
    52575258       
    52585259    def SetPeakRoll(newxy):
    5259         rho = mapData['rho']
     5260        rho = generalData['Map']['rho']
    52605261        roll = GetRoll(newxy,rho.shape)
    52615262        steps = 1./np.array(rho.shape)
Note: See TracChangeset for help on using the changeset viewer.