Bring loggin branch up to date

Merge remote-tracking branch 'origin/main' into logging

Author: briantoby

GSASII/GSASIIctrlGUI.py

@@ -6706,6 +6706,7 @@ def __init__(self,parent):
         self.vars = GetConfigValsDocs()
         self.G2frame = parent
         self.restart = False
+        self.reload = False
 
         label = wx.StaticText(
             self,  wx.ID_ANY,
@@ -6754,6 +6755,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

@@ -2487,6 +2487,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
@@ -2517,6 +2518,11 @@ def OnPreferences(self,event):
             print ('exiting GSAS-II')
             if hasattr(self,'logger'): self.PopEventHandler()
             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
@@ -3466,61 +3472,15 @@ def CheckNotebook(self):
         if new:
             self.GPXtree.Expand(self.GPXtree.root)
 
-    class CopyDialog(wx.Dialog):
-        '''Creates a dialog for copying control settings between
-        data tree items'''
-        def __init__(self,parent,title,text,data):
-            wx.Dialog.__init__(self,parent,-1,title,
-                pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
-            self.data = data
-            panel = wx.Panel(self)
-            mainSizer = wx.BoxSizer(wx.VERTICAL)
-            topLabl = wx.StaticText(panel,-1,text)
-            mainSizer.Add((10,10),1)
-            mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.LEFT,10)
-            mainSizer.Add((10,10),1)
-            ncols = len(data)/40+1
-            dataGridSizer = wx.FlexGridSizer(cols=ncols,hgap=2,vgap=2)
-            for Id,item in enumerate(self.data):
-                ckbox = wx.CheckBox(panel,Id,item[1])
-                ckbox.Bind(wx.EVT_CHECKBOX,self.OnCopyChange)
-                dataGridSizer.Add(ckbox,0,wx.LEFT,10)
-            mainSizer.Add(dataGridSizer,0,wx.EXPAND)
-            OkBtn = wx.Button(panel,-1,"Ok")
-            OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
-            cancelBtn = wx.Button(panel,-1,"Cancel")
-            cancelBtn.Bind(wx.EVT_BUTTON, self.OnCancel)
-            btnSizer = wx.BoxSizer(wx.HORIZONTAL)
-            btnSizer.Add((20,20),1)
-            btnSizer.Add(OkBtn)
-            btnSizer.Add((20,20),1)
-            btnSizer.Add(cancelBtn)
-            btnSizer.Add((20,20),1)
-
-            mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
-            panel.SetSizer(mainSizer)
-            panel.Fit()
-            self.Fit()
-
-        def OnCopyChange(self,event):
-            Id = event.GetId()
-            self.data[Id][0] = self.FindWindowById(Id).GetValue()
-
-        def OnOk(self,event):
-            parent = self.GetParent()
-            if parent is not None: parent.Raise()
-            self.EndModal(wx.ID_OK)
-
-        def OnCancel(self,event):
-            parent = self.GetParent()
-            if parent is not None: parent.Raise()
-            self.EndModal(wx.ID_CANCEL)
-
-        def GetData(self):
-            return self.data
-
     class SumDialog(wx.Dialog):
-        '''Allows user to supply scale factor(s) when summing data
+        '''Used to sum images or powder patterns. Allows user to supply 
+        scale factor(s) when summing data.
+
+        TODO: clean up the scrolling & resize on this dialog
+              Can we use the copy down button from CIF?
+        TODO: move it to GSASIIctrlGUI?
+        BHT: this class should not be in the middle of the (already too complex)
+        GSASIImain class. 
         '''
         def __init__(self,parent,title,text,dataType,data,dataList,Limits=None):
             wx.Dialog.__init__(self,parent,-1,title,size=(400,250),
@@ -4431,10 +4391,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:
@@ -4568,21 +4525,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
@@ -9170,6 +9131,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/GSASIIddataGUI.py

@@ -1522,6 +1522,8 @@ def OnDataApplyStrain(event):
         HAPBook.AddPage(HAPtab,phaseName)
         DData.append(HAPtab)
     HAPBook.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)
+    # must setup all Phase tabs to get the DataMenu
+    G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.DataGeneral)
     # set up "Select tab" menu contents
     G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.DataMenu)
     mid = G2frame.dataWindow.DataMenu.FindMenu('Select tab')

GSASII/GSASIIpath.py

@@ -1132,51 +1132,25 @@ def exceptHook(*args):
 
     This routine is only used when debug=True is set in the configuration settings
     '''
-    try:
-        #from IPython.core import ultratb
-        import IPython.core.ultratb
-    except:
-        pass
-
-    try:
-        from IPython.terminal.embed import InteractiveShellEmbed
-        import IPython.core
-        if sys.platform.startswith('win'):
-            IPython.core.ultratb.FormattedTB(call_pdb=False,color_scheme='NoColor')(*args)
-        else:
-            IPython.core.ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
-        from IPython.core import getipython
-        if getipython.get_ipython() is None:
-            ipshell = InteractiveShellEmbed.instance()
-        else:
-            ipshell = InteractiveShellEmbed()
-    except ImportError:
-        print ('IPython not installed or is really old')
-        return
-    except TypeError:  # Ipython 9.x removes color_scheme
-        try:
-            IPython.core.ultratb.FormattedTB(call_pdb=False)(*args)
-            from IPython.core import getipython
-            if getipython.get_ipython() is None:
-                ipshell = InteractiveShellEmbed.instance()
-            else:
-                ipshell = InteractiveShellEmbed()
-        except Exception as msg:
-            print('IPython patch failed, msg=',msg)
-    import inspect
-    frame = inspect.getinnerframes(args[2])[-1][0]
-    msg   = 'Entering IPython console at {0.f_code.co_filename} at line {0.f_lineno}\n'.format(frame)
+    import IPython.core
     savehook = sys.excepthook # save the exception hook
+    # show the error
+    tb_formatter = IPython.core.ultratb.VerboseTB()
+    print(tb_formatter.text(*args))
+    # get the Ipython shell routine
+    if IPython.core.getipython.get_ipython() is None:
+        ipshell = IPython.terminal.embed.InteractiveShellEmbed.instance()
+    else:
+        ipshell = IPython.terminal.embed.InteractiveShellEmbed()
+    # get to the right frame
     try:
+        import inspect
+        frame = inspect.getinnerframes(args[2])[-1][0]
+        msg = f'Entering IPython console at {frame.f_code.co_filename} at line {frame.f_lineno}\n'
         ipshell(msg,local_ns=frame.f_locals,global_ns=frame.f_globals) # newest (IPython >= 8)
-    except DeprecationWarning: # IPython <=7
-        try: # IPython >=5
-            class c(object): pass
-            pseudomod = c() # create something that acts like a module
-            pseudomod.__dict__ = frame.f_locals
-            InteractiveShellEmbed(banner1=msg)(module=pseudomod,global_ns=frame.f_globals)
-        except: # 'IPython <5
-            InteractiveShellEmbed(banner1=msg)(local_ns=frame.f_locals,global_ns=frame.f_globals)
+    except:
+        msg = 'Entering IPython console (no contex)'
+        ipshell(msg)
     sys.excepthook = savehook # reset IPython's change to the exception hook
 
 def DoNothing():

GSASII/GSASIIphsGUI.py

@@ -1560,7 +1560,7 @@ def updateAddRBorientText(G2frame,testRBObj,Bmat):
 #        sizer.SetValue(testRBObj['rbObj']['Orig'][0][i])
     # redraw asymmetric unit when called on an existing body
     if G2frame.testRBObjSizers.get('OnOrien') is None: return
-    G2frame.testRBObjSizers['OnOrien'](mode=testRBObj['rbObj']['drawMode'])
+    G2frame.testRBObjSizers['OnOrien'](mode=testRBObj['rbObj'].get('drawMode',DrawStyleChoice[4]))
 
 def GetReflData(G2frame,phaseName,reflNames):
     ReflData = {'RefList':[],'Type':''}
@@ -3020,15 +3020,15 @@ def _showWebPage(event):
             with open(tmp.name,'w') as fp:
                 fp.write(txt.replace(
                 '<HEAD>',
-                '<head><base href="https://stokes.byu.edu/iso/">',
+                '<head><base href="https://iso.byu.edu/">',
                 ))
             fileList.append(tmp.name)
             G2G.ShowWebPage('file://'+tmp.name,G2frame)
         import tempfile
         import re
         import requests
         from GSASII.exports import G2export_CIF
-        isosite="https://stokes.byu.edu/iso/"
+        isosite="https://iso.byu.edu/"
         upscript='isocifuploadfile.php'
         isoscript='isocifform.php'
         isoSubCite = ('For use of this supergroup search, please cite:\n'+
@@ -3078,7 +3078,7 @@ def _showWebPage(event):
             with open(tmp1.name,'w') as fp:
                 fp.write(r1.text.replace(
                 '<HEAD>',
-                '<head><base href="https://stokes.byu.edu/iso/">',
+                '<head><base href="https://iso.byu.edu/">',
                 ))
             G2G.ShowWebPage('file://'+tmp1.name,G2frame)
             G2G.G2MessageBox(G2frame,

GSASII/GSASIIpwdGUI.py

@@ -3227,6 +3227,15 @@ def onSelectX(event):
             plotIndex['plotX'] = event.GetEventObject().rbindex
             onPrmPlot(event)
 
+        def onCopySelRow(event):
+            row = event.GetEventObject().row
+            for i,h in enumerate(histnames):
+                if i == 0:
+                    val = histdict[h][row][2]
+                else:
+                    histdict[h][row][2] = val
+            wx.CallAfter(MakeMultiParameterWindow,selected)
+
         def onPrmPlot(event):
             '''Callback after a change to X or Y plot contents
             plots multiple instrument param values vs selected X value.
@@ -3281,26 +3290,27 @@ def onPrmPlot(event):
         parent = G2frame.dataWindow.topPanel
         topSizer.Add(wx.StaticText(parent,wx.ID_ANY,lbl))
         if hlist:
-            btn = wx.Button(parent, wx.ID_ANY,'Select\nHistograms')
+            btn = wx.Button(parent, wx.ID_ANY,'Select Histograms')
             topSizer.Add(btn,0,wx.LEFT|wx.RIGHT,15)
             btn.Bind(wx.EVT_BUTTON,onSelectHists)
-        topSizer.Add((20,-1))
+        topSizer.Add((20,-1),1,wx.EXPAND)
         topSizer.Add(G2G.HelpButton(parent,helpIndex=G2frame.dataWindow.helpKey))
         mainSizer =  wx.BoxSizer(wx.VERTICAL)
         G2frame.dataWindow.SetSizer(mainSizer)
 
         # create table w/headers
         sdlg = G2frame.dataWindow
-        fgs = wx.FlexGridSizer(0,len(histnames)+3,0,0)
+        fgs = wx.FlexGridSizer(0,len(histnames)+4,0,0)
         fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,'plot\nas X'),0,wx.LEFT|wx.RIGHT,1)
         fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,'plot\nas Y'),0,wx.LEFT|wx.RIGHT,1)
         fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,'Histogram  '),0,WACV|wx.LEFT,14)
         for i,h in enumerate(histnames):
-            if len(h[:5].strip()) > 20:
-                fgs.Add(G2G.ScrolledStaticText(sdlg,label=h[5:],dots=False,lbllen=20),
+            if len(h[5:].strip()) > 15:
+                fgs.Add(G2G.ScrolledStaticText(sdlg,label=h[5:],dots=False,lbllen=15),
                     0,WACV|wx.LEFT|wx.RIGHT,5)
             else:
                 fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,h[5:]),0,WACV|wx.LEFT|wx.RIGHT,5)
+            if i == 0: fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,'copy\nright'),0,wx.LEFT|wx.RIGHT,1)
         firstRadio = wx.RB_GROUP
         # put non-editable values at top of table (plot as x but not y)
         keylist = ['num']
@@ -3320,14 +3330,15 @@ def onPrmPlot(event):
             fgs.Add((-1,-1)) # skip y checkbutton
             fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,lbl),0,WACV|wx.LEFT,14)
             plotvals = []
-            for h in histnames:
+            for i,h in enumerate(histnames):
                 if key == 'num':
                     val = histnum[h]
                 else:
                     val = histdict[h][key][1]
                 fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,str(val)),
                     0,wx.ALIGN_CENTER|WACV,0)
                 plotvals.append(val)
+                if i == 0: fgs.Add((-1,-1)) # skip copy row button
             plotTbl.append(plotvals)
 
         # determine what items will be shown based on histogram type
@@ -3364,14 +3375,24 @@ def onPrmPlot(event):
             plotIndex[k] = rb.rbindex
             fgs.Add(wx.StaticText(sdlg,wx.ID_ANY,l),0,WACV|wx.LEFT,14)
             plotvals = []
-            for h in histnames:
+            for i,h in enumerate(histnames):
                 miniSizer = wx.BoxSizer(wx.HORIZONTAL)
                 itemVal = G2G.ValidatedTxtCtrl(sdlg,histdict[h][k],1,nDig=(10,4),typeHint=float)
                 plotvals.append(histdict[h][k][1])
                 miniSizer.Add(itemVal)
                 miniSizer.Add((2,-1))
-                miniSizer.Add(G2G.G2CheckBox(sdlg,'',histdict[h][k],2),0,WACV|wx.RIGHT,15)
-                fgs.Add(miniSizer,0,wx.ALIGN_CENTER)
+                if i == 0:
+                    miniSizer.Add(G2G.G2CheckBox(sdlg,'',histdict[h][k],2),0,WACV|wx.RIGHT,3)
+                    fgs.Add(miniSizer,0,wx.ALIGN_RIGHT)
+                    # copy row button
+                    but = wx.Button(sdlg,wx.ID_ANY,'\u2192',style=wx.BU_EXACTFIT)
+                    #but.SetBackgroundColour('yellow')
+                    fgs.Add(but,0,wx.RIGHT,15)
+                    but.Bind(wx.EVT_BUTTON, onCopySelRow)
+                    but.row = k
+                else:
+                    miniSizer.Add(G2G.G2CheckBox(sdlg,'',histdict[h][k],2),0,WACV|wx.RIGHT,15)
+                    fgs.Add(miniSizer,0,wx.ALIGN_CENTER)
             plotTbl.append(plotvals)
 
         mainSizer.Add(fgs)
@@ -5185,15 +5206,15 @@ def _showWebPage(event):
             txt = event.GetEventObject().page
             tmp = tempfile.NamedTemporaryFile(suffix='.html',delete=False)
             with open(tmp.name,'w') as fp:
-                fp.write(txt.replace('<HEAD>','<head><base href="https://stokes.byu.edu/">',))
+                fp.write(txt.replace('<HEAD>','<head><base href="https://iso.byu.edu/">',))
             fileList.append(tmp.name)
             G2G.ShowWebPage('file://'+tmp.name,G2frame)
 
         def showWebtext(txt):
             import tempfile
             tmp = tempfile.NamedTemporaryFile(suffix='.html',delete=False)
             with open(tmp.name,'w') as fp:
-                fp.write(txt.replace('<HEAD>','<head><base href="https://stokes.byu.edu/">',))
+                fp.write(txt.replace('<HEAD>','<head><base href="https://iso.byu.edu/">',))
             fileList.append(tmp.name)
             G2G.ShowWebPage('file://'+tmp.name,G2frame)