Changeset 5161 for trunk/GSASIIphsGUI.py

Timestamp:

Jan 27, 2022 9:14:31 AM (3 years ago)

Author:

vondreele

Message:

cleanup constraint display - remove excessive wx.RIGHT,wx.LEFT, etc. - now cleaner display
fix to ShowScrolledColText? - should be txtSizer.AddGrowableCol?(0); (1) caused crash
fix issues with seq PDFfit not copy forward, etc.

File:

• trunk/GSASIIphsGUI.py (modified) (10 diffs)

trunk/GSASIIphsGUI.py ¶

@@ -6314 +6314 @@
             Id =  G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Sequential PDFfit2 results')
             if Id:
-                SeqResult = G2frame.GPXtree.GetItemPyData(Id)
+                saveSeqResult = G2frame.GPXtree.GetItemPyData(Id)
             else:
                 SeqResult = {}
@@ -6356 +6356 @@
                     elif '#parameters' in line:
                         startParms = RMCPdict['Parms']
-                        if newParms and RMCPdict['SeqCopy']:
-                            startParms = newParms
-                        for iprm in startParms:
-                            newlines += 'pf.setpar(%s,%.6f)\n'%(iprm,startParms[iprm][0])
+                        if newParms or RMCPdict['SeqCopy']:
+                            if newParms:
+                                startParms = newParms
+                            for iprm in startParms:
+                                newlines += 'pf.setpar(%s,%.6f)\n'%(iprm,startParms[iprm][0])
+                        elif not RMCPdict['SeqCopy'] and SeqResult:
+                            startParms = saveSeqResult[Item[1]]['parmDict']
+                            for iprm in startParms:
+                                if not iprm.startswith('Temp'):
+                                    newlines += 'pf.setpar(%s,%.6f)\n'%(iprm,startParms[iprm][0])
                     else:
                         newlines += line
@@ -6395 +6401 @@
                 PDFctrl = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,pId,'PDF Controls'))
                 XYobs = PDFctrl['G(R)'][1]
-                XYobs = np.concatenate((XYobs,np.zeros_like(XYobs)),axis=0)
+                if XYobs.shape[0] < 4:
+                    XYobs = np.concatenate((XYobs,np.zeros_like(XYobs)),axis=0)
                 ibeg = np.searchsorted( XYobs[0],XYcalc[0][0])
                 ifin = ibeg+XYcalc.shape[1]
@@ -6401 +6408 @@
                 XYobs[3] = XYobs[1]-XYobs[2]
                 PDFctrl['G(R)'][1] = XYobs
-                G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,pId,'PDF Controls'),PDFctrl)
                 SeqResult['histNames'].append(Item[1])
                 GoOn = pgbar.Update(itm,newmsg='PDF G(R) done = %d'%(itm))
@@ -6996 +7002 @@
             
         
-#--- ISODISTORT results tab ###############################################################################
+#### ISODISTORT tab ###############################################################################
 
     def UpdateISODISTORT(Scroll=0):
@@ -7227 +7233 @@
             topSizer.Add(G2G.HelpButton(ISODIST,helpIndex=G2frame.dataWindow.helpKey),0,wx.ALIGN_TOP)
             mainSizer.Add(topSizer,0,wx.EXPAND)
+            mainSizer.Add(wx.StaticText(ISODIST,label=ISOcite),0,wx.TOP,10)
             
             mainSizer.Add(wx.StaticText(ISODIST,label=
@@ -7238 +7245 @@
             modeDisp = ISOdata['modeDispl']
             idsp = 0
-            slideSizer.Add(wx.StaticText(ISODIST,label='Isodistort mode name'),0,wx.ALIGN_CENTER)
-            slideSizer.Add(wx.StaticText(ISODIST,label='Initial value'))
-            slideSizer.Add(wx.StaticText(ISODIST,label='Display value'),0,wx.ALIGN_CENTER)
+            slideSizer.Add(wx.StaticText(ISODIST,label='Name'),0,wx.ALIGN_CENTER)
+            slideSizer.Add(wx.StaticText(ISODIST,label='Save value'))
+            slideSizer.Add(wx.StaticText(ISODIST,label='Value'),0,wx.ALIGN_CENTER)
             slideSizer.Add(wx.StaticText(ISODIST,label='Refine?'))
             isoDict = {i.name:j for (i,j) in zip(data['ISODISTORT']['G2ModeList'],data['ISODISTORT']['IsoModeList'])}
@@ -7251 +7258 @@
                     continue
                 if  item[-3].name not in isoDict: continue
-                isoName = isoDict[item[-3].name]
+                isoName = item[-3].varname().split('::')[1]
                 slideSizer.Add(wx.StaticText(ISODIST,label=isoName),0,WACV)
                 slideSizer.Add(wx.StaticText(ISODIST,label=' %.5g '%ISOdata['ISOmodeDispl'][idsp],
-                                                 style=wx.ALIGN_CENTER_HORIZONTAL),0,WACV|wx.EXPAND)
+                    style=wx.ALIGN_CENTER_HORIZONTAL),0,WACV|wx.EXPAND)
                 lineSizer = wx.BoxSizer(wx.HORIZONTAL)            
                 dispVal = G2G.ValidatedTxtCtrl(ISODIST,modeDisp,idsp,xmin=-2.,xmax=2.,size=(75,20),OnLeave=OnDispVal)
                 lineSizer.Add(dispVal,0,WACV)
-                displ = wx.Slider(ISODIST,style=wx.SL_HORIZONTAL,minValue=-2000,maxValue=2000,value=int(modeDisp[idsp]*1000))
+                displ = wx.Slider(ISODIST,style=wx.SL_HORIZONTAL,minValue=-2000,maxValue=2000,
+                    value=int(modeDisp[idsp]*1000),size=(250,20))
                 displ.Bind(wx.EVT_SLIDER, OnDispl)
                 Indx[displ.GetId()] = [idsp,dispVal]
@@ -7270 +7278 @@
                 slideSizer.Add(refDispl,0,WACV|wx.EXPAND|wx.LEFT,15)
                 idsp += 1
-            slideSizer.SetMinSize(wx.Size(450,10))
+            slideSizer.SetMinSize(wx.Size(650,10))
             mainSizer.Add(slideSizer)
             lineSizer = wx.BoxSizer(wx.HORIZONTAL)            
-            reset = wx.Button(ISODIST,label='Reset modes to initial values')
+            reset = wx.Button(ISODIST,label='Reset modes to save values')
             reset.Bind(wx.EVT_BUTTON,OnReset)
             lineSizer.Add(reset,0,WACV)
@@ -7279 +7287 @@
             reset.Bind(wx.EVT_BUTTON,OnSetZero)
             lineSizer.Add(reset,0,wx.ALL,10)
-            reset = wx.Button(ISODIST,label='Save displayed mode values')
+            reset = wx.Button(ISODIST,label='Save mode values')
             reset.Bind(wx.EVT_BUTTON,OnSaveModes)
             lineSizer.Add(reset,0,WACV)
             mainSizer.Add(lineSizer,0,wx.TOP,5)
-            mainSizer.Add(wx.StaticText(ISODIST,label=ISOcite),0,wx.TOP,10)
             mainSizer.Layout()
             SetPhaseWindow(ISODIST,mainSizer,Scroll=Scroll)