Ignore:
Timestamp:
Jul 22, 2020 8:50:13 PM (17 months ago)
Author:
toby
Message:

refactor ViewLSparms; more fullrmc work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r4531 r4532  
    2424import sys
    2525import os
    26 #import glob
    27 #import imp
    2826import inspect
    2927if '2' in platform.python_version_tuple()[0]:
     
    624622        self.Bind(wx.EVT_MENU, self.OnMakePDFs, id=item.GetId())
    625623       
    626         item = parent.Append(wx.ID_ANY,'&View LS parms','View least squares parameters')
     624        item = parent.Append(wx.ID_ANY,'&View LS parms\tCTRL+L','View least squares parameters')
    627625        self.Bind(wx.EVT_MENU, self.OnShowLSParms, id=item.GetId())
    628626       
     
    13351333        item = submenu.Append(wx.ID_ANY,'Auto Import','Import data files as found')
    13361334        def OnAutoImport(event):
    1337             #import imp
    1338             #imp.reload(G2G)
    13391335            G2G.AutoLoadFiles(self,FileTyp='pwd')
    13401336        self.Bind(wx.EVT_MENU, OnAutoImport, id=item.GetId())
     
    25272523        item = submenu.Append(wx.ID_ANY,'Auto Import','Import PDF files as found')
    25282524        def OnAutoImport(event):
    2529             #import imp
    2530             #imp.reload(G2G)
    25312525            G2G.AutoLoadFiles(self,FileTyp='gr')
    25322526        self.Bind(wx.EVT_MENU, OnAutoImport, id=item.GetId())
     
    49734967            pass
    49744968        wx.EndBusyCursor()
    4975         dlg = G2G.ShowLSParms(self,'Least Squares Parameters',parmValDict,varyList,reqVaryList)
     4969        # debug stuff
     4970        if GSASIIpath.GetConfigValue('debug'):
     4971            print('reloading',G2G)
     4972            import imp
     4973            imp.reload(G2G)
     4974        # end debug stuff           
     4975        dlg = G2G.ShowLSParms(self,'Least Squares Parameters',parmValDict,
     4976                                  varyList,reqVaryList)
    49764977        dlg.ShowModal()
    49774978        dlg.Destroy()
     
    60636064       
    60646065        #Phase / fullrmc & RMCprofile (Reverse Monte Carlo method) tab
    6065         G2G.Define_wxId('wxID_SETUPRMC','wxID_RUNRMC','wxID_VIEWRMC' )       
     6066        G2G.Define_wxId('wxID_SETUPRMC','wxID_RUNRMC','wxID_VIEWRMC',
     6067                            'wxID_STOPRMC')       
    60666068        self.FRMCMenu = wx.MenuBar()
    60676069        self.PrefillDataMenu(self.FRMCMenu)
     
    60716073        self.FRMCDataEdit.Append(G2G.wxID_SETUPRMC,'Setup RMC','Setup new fullrmc or RMCprofile file')
    60726074        self.FRMCDataEdit.Append(G2G.wxID_RUNRMC,'Execute','Run fullrmc or RMCprofile file')
    6073         self.FRMCDataEdit.Append(G2G.wxID_VIEWRMC,'View','View fullrmc or RMCprofile results')
     6075        self.FRMCDataEdit.Append(G2G.wxID_STOPRMC,'Stop run','Stop fullrmc run')
     6076        self.FRMCDataEdit.Append(G2G.wxID_VIEWRMC,'Plot','View fullrmc or RMCprofile results')
    60746077        self.PostfillDataMenu()
    60756078       
Note: See TracChangeset for help on using the changeset viewer.