Changeset 4192 for trunk/GSASIIdataGUI.py

Timestamp:

Nov 22, 2019 1:28:42 PM (3 years ago)

Author:

vondreele

Message:

fix OnFileReopen?; broke when some file were deleted beforehand
Some preliminaries for rmc stuff
allow use of default instrument parameters upon Load command - same idea; cancel brings up default list choice

File:

• trunk/GSASIIdataGUI.py (modified) (4 diffs)

trunk/GSASIIdataGUI.py

@@ -2905 +2905 @@
         self.newGPXfile = ''
         self.lastSelectedPhaseTab = None # track the last tab pressed on a phase window
-        self.testRBObjSizers = {}   #rigid body sizer data
+        self.testRBObjSizers = {}   #rigid body sizer datafile contents
+        self.RMCchoice = 'fullrmc' 
         
     def __init__(self, parent):
@@ -3817 +3818 @@
             dlg.Destroy()
             return
-        f = files[sel]
+        filroot,dirname = sellist[sel].split(' from ')
+        f = os.path.join(dirname,filroot)
         if os.path.exists(f):
             self.OnFileOpen(event, filename=f)
@@ -5705 +5707 @@
         self.PostfillDataMenu()
         
-        #Phase / fullrmc (Reverse Monte Carlo method) tab
-        G2G.Define_wxId('wxID_SETUPFULLRMC','wxID_LOADFULLRMC','wxID_SAVEFULLRMC','wxID_EDITFULLRMC','wxID_RUNFULLRMC', )       
+        #Phase / fullrmc & RMCprofile (Reverse Monte Carlo method) tab
+        G2G.Define_wxId('wxID_SETUPRMC','wxID_LOADRMC','wxID_SAVERMC','wxID_RUNRMC', )       
         self.FRMCMenu = wx.MenuBar()
         self.PrefillDataMenu(self.FRMCMenu)
@@ -5712 +5714 @@
         self.FRMCDataEdit = wx.Menu(title='')
         self.FRMCMenu.Append(menu=self.FRMCDataEdit, title='Operations')
-        self.FRMCDataEdit.Append(G2G.wxID_SETUPFULLRMC,'Setup run.py','Setup new fullrmc run.py file')
-        self.FRMCDataEdit.Append(G2G.wxID_LOADFULLRMC,'Load run.py','Load fullrmc run.py file')
-        self.FRMCDataEdit.Append(G2G.wxID_SAVEFULLRMC,'Save run.py','Save fullrmc run.py file')
-        self.FRMCDataEdit.Append(G2G.wxID_EDITFULLRMC,'Edit run.py','Edit fullrmc run.py file')
-        self.FRMCDataEdit.Append(G2G.wxID_RUNFULLRMC,'Execute run.py','Run fullrmc run.py file')
+        self.FRMCDataEdit.Append(G2G.wxID_SETUPRMC,'Setup RMC','Setup new fullrmc or RMCprofile file')
+        self.FRMCDataEdit.Append(G2G.wxID_LOADRMC,'Load','Load fullrmc or RMCprofile file')
+        self.FRMCDataEdit.Append(G2G.wxID_SAVERMC,'Save','Save fullrmc or RMCprofile file')
+        self.FRMCDataEdit.Append(G2G.wxID_RUNRMC,'Execute','Run fullrmc or RMCprofile file')
         self.PostfillDataMenu()