Ignore:
Timestamp:
Jul 1, 2017 6:22:10 AM (5 years ago)
Author:
vondreele
Message:
 
Location:
branch/2frame
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branch/2frame/GSASIIplot.py

    r2871 r2888  
    18261826        Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Reflection Lists'))
    18271827        Page.phaseList = sorted(Phases.keys()) # define an order for phases (once!)
    1828         G2frame.dataFrame.Bind(wx.EVT_MENU, onMoveDiffCurve, id=G2frame.dataFrame.moveDiffCurve.GetId())
    1829         G2frame.dataFrame.Bind(wx.EVT_MENU, onMoveTopTick, id=G2frame.dataFrame.moveTickLoc.GetId())
    1830         G2frame.dataFrame.Bind(wx.EVT_MENU, onMoveTickSpace, id=G2frame.dataFrame.moveTickSpc.GetId())
    1831         G2frame.dataFrame.moveDiffCurve.Enable(False)
    1832         G2frame.dataFrame.moveTickLoc.Enable(False)
    1833         G2frame.dataFrame.moveTickSpc.Enable(False)
     1828        G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveDiffCurve, id=G2frame.dataWindow.moveDiffCurve.GetId())
     1829        G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveTopTick, id=G2frame.dataWindow.moveTickLoc.GetId())
     1830        G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveTickSpace, id=G2frame.dataWindow.moveTickSpc.GetId())
     1831        G2frame.dataWindow.moveDiffCurve.Enable(False)
     1832        G2frame.dataWindow.moveTickLoc.Enable(False)
     1833        G2frame.dataWindow.moveTickSpc.Enable(False)
    18341834    elif G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Peak List':
    1835         G2frame.dataFrame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataFrame.movePeak.GetId())
     1835        G2frame.dataFrame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataWindow.movePeak.GetId())
    18361836    # save information needed to reload from tree and redraw
    18371837    kwargs={'PatternName':G2frame.PatternTree.GetItemText(G2frame.PatternId)}
     
    21542154                        data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'))
    21552155                        selectedPeaks = list(set(
    2156                             [row for row,col in G2frame.dataDisplay.GetSelectedCells()] +
    2157                             G2frame.dataDisplay.GetSelectedRows()))
    2158                         G2frame.dataFrame.movePeak.Enable(len(selectedPeaks) == 1) # allow peak move from table when one peak is selected
     2156                            [row for row,col in G2frame.reflGrid.GetSelectedCells()] +
     2157                            G2frame.reflGrid.GetSelectedRows()))
     2158                        G2frame.dataWindow.movePeak.Enable(len(selectedPeaks) == 1) # allow peak move from table when one peak is selected
    21592159                        for i,item in enumerate(data['peaks']):
    21602160                            if i in selectedPeaks:
     
    22922292    if 'PWDR' in G2frame.PatternTree.GetItemText(G2frame.PickId):
    22932293        if len(Page.tickDict.keys()) == 1:
    2294             G2frame.dataFrame.moveTickLoc.Enable(True)
     2294            G2frame.dataWindow.moveTickLoc.Enable(True)
    22952295        elif len(Page.tickDict.keys()) > 1:
    2296             G2frame.dataFrame.moveTickLoc.Enable(True)
    2297             G2frame.dataFrame.moveTickSpc.Enable(True)
     2296            G2frame.dataWindow.moveTickLoc.Enable(True)
     2297            G2frame.dataWindow.moveTickSpc.Enable(True)
    22982298        if DifLine[0]:
    2299             G2frame.dataFrame.moveDiffCurve.Enable(True)
     2299            G2frame.dataWindow.moveDiffCurve.Enable(True)
    23002300   
    23012301################################################################################
     
    43754375      triggers the addition of a d-zero.   
    43764376    '''
    4377     G2frame.dataFrame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',0)
     4377    G2frame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',0)
    43784378    G2frame.PickId = G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Stress/Strain')
    43794379    data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
     
    48564856                        Data['ring'].append([xpos,ypos])
    48574857                elif event.button == 3:
    4858                     G2frame.dataFrame.GetStatusBar().SetStatusText('Calibrating...',0)
     4858                    G2frame.GetStatusBar().SetStatusText('Calibrating...',0)
    48594859                    if G2img.ImageCalibrate(G2frame,Data):
    4860                         G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',0)
     4860                        G2frame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check',0)
    48614861                        print 'Calibration successful'
    48624862                    else:
    4863                         G2frame.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',0)
     4863                        G2frame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose',0)
    48644864                        print 'Calibration failed'
    48654865                    G2frame.ifGetRing = False
     
    62476247        GL.glMultMatrixf(B4mat.T)
    62486248        GL.glDisable(GL.GL_LIGHTING)
    6249         GL.glRasterPos3f(0,0,0)
     6249        GL.glWindowPos3f(0,0,0)
    62506250        GL.glMultMatrixf(matRot)
    62516251        GL.glRotate(180,1,0,0)             #fix to flip about x-axis
     
    62546254        GL.glEnable(GL.GL_LIGHTING)
    62556255        GL.glPopMatrix()
    6256        
     6256         
    62576257    def RenderMap(rho,rhoXYZ,indx,Rok):
    62586258        GL.glShadeModel(GL.GL_FLAT)
Note: See TracChangeset for help on using the changeset viewer.