Changeset 4236 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
Jan 8, 2020 9:44:02 AM (2 years ago)
Author:
vondreele
Message:

remove dependence on fullrmc existing
rearrange RMC options
fixes to RMCProfile file prep.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r4221 r4236  
    46314631        mainSizer = wx.BoxSizer(wx.VERTICAL)
    46324632        runFile = ' '
    4633         choice = ['fullrmc','RMCProfile']
     4633        choice = ['RMCProfile','fullrmc',]
    46344634        RMCsel = wx.RadioBox(G2frame.FRMC,-1,' Select RMC method:',choices=choice)
    46354635        RMCsel.SetStringSelection(G2frame.RMCchoice)
     
    1049810498        G2frame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2G.wxID_PEAKSCLEAR)
    1049910499        # fullrmc
    10500         try:
    10501             import fullrmc
    10502             FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.FRMCMenu)
    10503             G2frame.Bind(wx.EVT_MENU, OnSetupRMC, id=G2G.wxID_SETUPRMC)
    10504             G2frame.Bind(wx.EVT_MENU, OnLoadRMC, id=G2G.wxID_LOADRMC)
    10505             G2frame.Bind(wx.EVT_MENU, OnSaveRMC, id=G2G.wxID_SAVERMC)
    10506             G2frame.Bind(wx.EVT_MENU, OnRunRMC, id=G2G.wxID_RUNRMC)
    10507             G2frame.Bind(wx.EVT_MENU, OnViewRMC, id=G2G.wxID_VIEWRMC)
    10508         except:
    10509             pass
     10500        FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.FRMCMenu)
     10501        G2frame.Bind(wx.EVT_MENU, OnSetupRMC, id=G2G.wxID_SETUPRMC)
     10502        G2frame.Bind(wx.EVT_MENU, OnLoadRMC, id=G2G.wxID_LOADRMC)
     10503        G2frame.Bind(wx.EVT_MENU, OnSaveRMC, id=G2G.wxID_SAVERMC)
     10504        G2frame.Bind(wx.EVT_MENU, OnRunRMC, id=G2G.wxID_RUNRMC)
     10505        G2frame.Bind(wx.EVT_MENU, OnViewRMC, id=G2G.wxID_VIEWRMC)
    1051010506        # MC/SA
    1051110507        FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.MCSAMenu)
     
    1059910595        G2frame.phaseDisplay.AddPage(G2frame.MCSA,'MC/SA')
    1060010596        Pages.append('MC/SA')
    10601         try:
    10602             import fullrmc
    10603             G2frame.FRMC = wx.ScrolledWindow(G2frame.phaseDisplay)
    10604             G2frame.phaseDisplay.AddPage(G2frame.FRMC,'RMC')
    10605             Pages.append('RMC')
    10606         except:
    10607             pass
     10597        G2frame.FRMC = wx.ScrolledWindow(G2frame.phaseDisplay)
     10598        G2frame.phaseDisplay.AddPage(G2frame.FRMC,'RMC')
     10599        Pages.append('RMC')
    1060810600    Texture = wx.ScrolledWindow(G2frame.phaseDisplay)
    1060910601    G2frame.phaseDisplay.AddPage(Texture,'Texture')
Note: See TracChangeset for help on using the changeset viewer.