Changeset 4532 for trunk/GSASIIdataGUI.py

Timestamp:

Jul 22, 2020 8:50:13 PM (3 years ago)

Author:

toby

Message:

refactor ViewLSparms; more fullrmc work

File:

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

trunk/GSASIIdataGUI.py

@@ -24 +24 @@
 import sys
 import os
-#import glob
-#import imp
 import inspect
 if '2' in platform.python_version_tuple()[0]:
@@ -624 +622 @@
         self.Bind(wx.EVT_MENU, self.OnMakePDFs, id=item.GetId())
         
-        item = parent.Append(wx.ID_ANY,'&View LS parms','View least squares parameters')
+        item = parent.Append(wx.ID_ANY,'&View LS parms\tCTRL+L','View least squares parameters')
         self.Bind(wx.EVT_MENU, self.OnShowLSParms, id=item.GetId())
         
@@ -1335 +1333 @@
         item = submenu.Append(wx.ID_ANY,'Auto Import','Import data files as found')
         def OnAutoImport(event):
-            #import imp
-            #imp.reload(G2G)
             G2G.AutoLoadFiles(self,FileTyp='pwd')
         self.Bind(wx.EVT_MENU, OnAutoImport, id=item.GetId())
@@ -2527 +2523 @@
         item = submenu.Append(wx.ID_ANY,'Auto Import','Import PDF files as found')
         def OnAutoImport(event):
-            #import imp
-            #imp.reload(G2G)
             G2G.AutoLoadFiles(self,FileTyp='gr')
         self.Bind(wx.EVT_MENU, OnAutoImport, id=item.GetId())
@@ -4973 +4967 @@
             pass
         wx.EndBusyCursor()
-        dlg = G2G.ShowLSParms(self,'Least Squares Parameters',parmValDict,varyList,reqVaryList)
+        # debug stuff
+        if GSASIIpath.GetConfigValue('debug'):
+            print('reloading',G2G)
+            import imp
+            imp.reload(G2G)
+        # end debug stuff            
+        dlg = G2G.ShowLSParms(self,'Least Squares Parameters',parmValDict,
+                                  varyList,reqVaryList)
         dlg.ShowModal()
         dlg.Destroy()
@@ -6063 +6064 @@
         
         #Phase / fullrmc & RMCprofile (Reverse Monte Carlo method) tab
-        G2G.Define_wxId('wxID_SETUPRMC','wxID_RUNRMC','wxID_VIEWRMC' )       
+        G2G.Define_wxId('wxID_SETUPRMC','wxID_RUNRMC','wxID_VIEWRMC',
+                            'wxID_STOPRMC')       
         self.FRMCMenu = wx.MenuBar()
         self.PrefillDataMenu(self.FRMCMenu)
@@ -6071 +6073 @@
         self.FRMCDataEdit.Append(G2G.wxID_SETUPRMC,'Setup RMC','Setup new fullrmc or RMCprofile file')
         self.FRMCDataEdit.Append(G2G.wxID_RUNRMC,'Execute','Run fullrmc or RMCprofile file')
-        self.FRMCDataEdit.Append(G2G.wxID_VIEWRMC,'View','View fullrmc or RMCprofile results')
+        self.FRMCDataEdit.Append(G2G.wxID_STOPRMC,'Stop run','Stop fullrmc run')
+        self.FRMCDataEdit.Append(G2G.wxID_VIEWRMC,'Plot','View fullrmc or RMCprofile results')
         self.PostfillDataMenu()