Ignore:
Timestamp:
Jul 7, 2017 12:32:09 PM (5 years ago)
Author:
vondreele
Message:

fix G2constrGUI; dataDisplay --> rbBook & fix a parent issue
similarly in G2restrGUI dataDisplay --> restrBook
G2ctrlGUI; missing G2obj import & fix a parent issue on a couple of dialogs
put the wxID definitions into _initMenus - need to be sorted into each section
remove the tree title - redundant info
tree root text changed
G2plot; change dataDisplay to restrBook for torsion & Ramachandran plots
some dataDisplay --> phaseDisplay in various places

File:
1 edited

Legend:

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

    r2913 r2914  
    40644064        except:
    40654065            return
    4066         if G2frame.dataDisplay.GetPageText(page) == 'Torsion restraints':
    4067             torGrid = G2frame.dataDisplay.GetPage(page).Torsions
     4066        if G2frame.restrBook.GetPageText(page) == 'Torsion restraints':
     4067            torGrid = G2frame.restrBook.GetPage(page).Torsions
    40684068            torGrid.ClearSelection()
    40694069            for row in range(torGrid.GetNumberRows()):
     
    41294129            dlg.Destroy()
    41304130        PlotRama(G2frame,phaseName,Rama,RamaName,Names,PhiPsi,Coeff)
     4131       
    41314132    def OnPick(event):
    41324133        ind = event.ind[0]
     
    41344135        Page.canvas.SetToolTipString(msg)
    41354136        try:
    4136             page = G2frame.dataDisplay.GetSelection()
     4137            page = G2frame.restrBook.GetSelection()
    41374138        except:
    41384139            return
    4139         if G2frame.dataDisplay.GetPageText(page) == 'Ramachandran restraints':
    4140             ramaGrid = G2frame.dataDisplay.GetPage(page).Ramas
     4140        if G2frame.restrBook.GetPageText(page) == 'Ramachandran restraints':
     4141            ramaGrid = G2frame.restrBook.GetPage(page).Ramas
    41414142            ramaGrid.ClearSelection()
    41424143            for row in range(ramaGrid.GetNumberRows()):
     
    58105811        if page:
    58115812            if G2frame.phaseDisplay.GetPageText(page) == 'Draw Options':
    5812                 G2frame.dataDisplay.viewDir.SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
     5813                G2frame.phaseDisplay.viewDir.SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
    58135814               
    58145815    def SetMapPeaksText(mapPeaks):
     
    58185819            if G2frame.phaseDisplay.GetPageText(page) == 'Map peaks':
    58195820                G2frame.MapPeaksTable.SetData(data['Map Peaks'])
    5820                 panel = G2frame.dataDisplay.GetPage(page).GetChildren()
     5821                panel = G2frame.phaseDisplay.GetPage(page).GetChildren()
    58215822                names = [child.GetName() for child in panel]
    58225823                try:
     
    58335834                    table[i][2:5] = atom[2:5]
    58345835                G2frame.atomTable.SetData(table)
    5835                 panel = G2frame.dataDisplay.GetPage(page).GetChildren()
     5836                panel = G2frame.phaseDisplay.GetPage(page).GetChildren()
    58365837                names = [child.GetName() for child in panel]
    58375838                try:
     
    66366637#        page = getSelection()
    66376638#        if page:
    6638 #            if G2frame.dataDisplay.GetPageText(page) == 'Rigid bodies':
     6639#            if G2frame.GetPageText(page) == 'Rigid bodies':
    66396640#                G2frame.MapPeaksTable.SetData(mapPeaks)
    6640 #                panel = G2frame.dataDisplay.GetPage(page).GetChildren()
     6641#                panel = G2frame.GetPage(page).GetChildren()
    66416642#                names = [child.GetName() for child in panel]
    66426643#                panel[names.index('grid window')].Refresh()
Note: See TracChangeset for help on using the changeset viewer.