Add preference option to reload rather that restart; switch SeparateHistPhaseTreeItem to reload

Author: briantoby

GSASII/GSASIIctrlGUI.py

@@ -6680,6 +6680,7 @@ def __init__(self,parent):
         self.vars = GetConfigValsDocs()
         self.G2frame = parent
         self.restart = False
+        self.reload = False
 
         label = wx.StaticText(
             self,  wx.ID_ANY,
@@ -6728,6 +6729,8 @@ def OnChange(self,event=None):
                 self.saveBtn.Enable(True)
                 if 'restart' in self.vars[var][3].lower():
                     self.restart  = True
+                elif 'reload' in self.vars[var][3].lower():
+                    self.reload  = True
                 break
         else:
             self.saveBtn.Enable(False)

GSASII/GSASIIdataGUI.py

@@ -2335,6 +2335,7 @@ def OnPreferences(self,event):
         try:
             dlg.ShowModal() == wx.ID_OK
             restart = dlg.restart
+            reload = dlg.reload
         finally:
             dlg.Destroy()
         # trigger a restart if the var description asks for that
@@ -2364,6 +2365,11 @@ def OnPreferences(self,event):
             G2fil.openInNewTerm(project)
             print ('exiting GSAS-II')
             sys.exit()
+        if reload:
+            ans = self.OnFileSave(None)
+            if not ans: return
+            self.clearProject() # clear out data tree
+            self.StartProject()
 
     def _Add_ImportMenu_smallangle(self,parent):
         '''configure the Small Angle Data menus accord to the readers found in _init_Imports
@@ -4225,10 +4231,7 @@ def GetGPX():
             GetGPX()
             filename = self.GSASprojectfile
         else:
-            try:
-                self.GSASprojectfile = os.path.splitext(filename)[0]+u'.gpx'
-            except:
-                self.GSASprojectfile = os.path.splitext(filename)[0]+'.gpx'
+            self.GSASprojectfile = os.path.splitext(filename)[0]+'.gpx'
             self.dirname = os.path.split(filename)[0]
 
 #        if self.G2plotNB.plotList:
@@ -4356,21 +4359,25 @@ def OnFileClose(self, event):
                 self.OnFileSaveMenu(event)
             if result != wx.ID_CANCEL:
                 self.GSASprojectfile = ''
-                self.GPXtree.SetItemText(self.root,'Project: ')
-                self.GPXtree.DeleteChildren(self.root)
-                self.dataWindow.ClearData()
-                if len(self.HKL):
-                    self.HKL = np.array([])
-                    self.Extinct = []
-                if self.G2plotNB.plotList:
-                    self.G2plotNB.clear()
-                self.SetTitleByGPX()
-                self.EnableRefineCommand()
-                self.init_vars()
-                G2obj.IndexAllIds({},{}) # clear old index info
+                self.clearProject()
         finally:
             dlg.Destroy()
 
+    def clearProject(self):
+        'Initializes the data tree etc.'
+        self.GPXtree.SetItemText(self.root,'Project: ')
+        self.GPXtree.DeleteChildren(self.root)
+        self.dataWindow.ClearData()
+        if len(self.HKL):
+            self.HKL = np.array([])
+            self.Extinct = []
+        if self.G2plotNB.plotList:
+            self.G2plotNB.clear()
+        self.SetTitleByGPX()
+        self.EnableRefineCommand()
+        self.init_vars()
+        G2obj.IndexAllIds({},{}) # clear old index info
+                
     def OnFileSave(self, event):
         '''Save the current project in response to the
         File/Save Project menu button
@@ -8943,6 +8950,10 @@ def OnShowShift(event):
         G2pdG.UpdateLimitsGrid(G2frame,data,datatype)
         G2pwpl.PlotPatterns(G2frame,plotType=datatype,newPlot=True,fromTree=True)
     elif G2frame.GPXtree.GetItemText(item) == 'Instrument Parameters':
+        # if GSASIIpath.GetConfigValue('debug'):
+        #    from importlib import reload
+        #    reload(G2pdG)
+        #    print('reloading G2pwdGUI')
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)
         data = G2frame.GPXtree.GetItemPyData(item)[0]
         G2pdG.UpdateInstrumentGrid(G2frame,data)

GSASII/config_example.py

@@ -302,8 +302,9 @@
 '''When this is set to True, the parameters specific to each histogram 
 and phase together (such as peak shapes & phase fractions) 
 are shown as a 1st-level tree item rather than inside each Phase's
-Data tab. After changing this, GSAS-II needs to be restarted for the 
-change to take effect. Default is False.
+Data tab. If this is changed, the current GSAS-II project will be saved 
+and will be reloaded for the change to take effect. 
+Default is False.
 '''
 
 G2RefinementWindow = False