Changeset 1830

Timestamp:

May 1, 2015 10:30:34 AM (8 years ago)

Author:

vondreele

Message:

change ftol on texture refinement - stop on real convergence
improve spacing for texture display
remove up/down buttons from Ddata display; do set focus back to this window when up/down arrows used to scan thru data

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (3 diffs)
• GSASIImath.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIddataGUI.py

@@ -789 +789 @@
     def OnSelect(event):
         G2frame.hist = keyList[select.GetSelection()]
-        selSpin.SetValue(keyList.index(G2frame.hist))
+        oldFocus = wx.Window.FindFocus()
         G2plt.PlotSizeStrainPO(G2frame,data,G2frame.hist)
+        oldFocus.SetFocus()
         wx.CallLater(100,RepaintHistogramInfo)
        
-    def OnSelSpin(event):
-        G2frame.hist = keyList[selSpin.GetValue()]
-        selSpin.SetValue(keyList.index(G2frame.hist))
-        select.SetSelection(keyList.index(G2frame.hist))
-        select.SetFirstItem(keyList.index(G2frame.hist))
-        G2plt.PlotSizeStrainPO(G2frame,data,G2frame.hist)
-        wx.CallLater(100,RepaintHistogramInfo)
-        
     def RepaintHistogramInfo():
         G2frame.bottomSizer.DeleteWindows()
@@ -921 +914 @@
         return bottomSizer
                 
-    #DData.DestroyChildren() # bad, deletes scrollbars on Mac!
     if DData.GetSizer():
         DData.GetSizer().Clear(True)
@@ -928 +920 @@
     if G2frame.hist != '':
         topSizer = wx.FlexGridSizer(1,2,5,5)
-        selSizer = wx.BoxSizer(wx.HORIZONTAL)    
-        selSpin = wx.SpinButton(DData,size=(20,120),style=wx.SP_VERTICAL|wx.SP_WRAP)
-        selSpin.SetValue(keyList.index(G2frame.hist))
-        selSpin.SetRange(0,len(keyList)-1)
-        selSpin.Bind(wx.EVT_SPIN,OnSelSpin)
-        selSizer.Add(selSpin)
         select = wx.ListBox(DData,choices=keyList,style=wx.LB_SINGLE,size=(-1,120))
         select.SetSelection(keyList.index(G2frame.hist))
         select.SetFirstItem(keyList.index(G2frame.hist))
         select.Bind(wx.EVT_LISTBOX,OnSelect)
-        selSizer.Add(select,0,WACV)
-        topSizer.Add(selSizer)
+        topSizer.Add(select,0,WACV|wx.LEFT,5)
         if PWDR:
             topSizer.Add(PlotSizer())

trunk/GSASIImath.py

@@ -1724 +1724 @@
         begin = time.time()
         values =  np.array(Dict2Values(parmDict, varyList))
-        result = so.leastsq(errSpHarm,values,Dfun=dervSpHarm,full_output=True,
+        result = so.leastsq(errSpHarm,values,Dfun=dervSpHarm,full_output=True,ftol=1.e-6,
             args=(SGData,cell,Gangls,Texture['Model'],refData,parmDict,varyList,pgbar))
         ncyc = int(result[2]['nfev']/2)

trunk/GSASIIphsGUI.py

@@ -3641 +3641 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         titleSizer = wx.BoxSizer(wx.HORIZONTAL)
-        titleSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonics texture data for '+PhaseName+':'),0,WACV)
+        titleSizer.Add(wx.StaticText(Texture,-1,' Spherical harmonics texture data for '+PhaseName+':'),0,WACV)
         titleSizer.Add(wx.StaticText(Texture,-1,
             ' Texture Index J = %7.3f'%(G2lat.textureIndex(textureData['SH Coeff'][1]))),
@@ -3648 +3648 @@
         mainSizer.Add((0,5),0)
         shSizer = wx.FlexGridSizer(0,6,5,5)
-        shSizer.Add(wx.StaticText(Texture,-1,'Texture model: '),0,WACV)
+        shSizer.Add(wx.StaticText(Texture,-1,' Texture model: '),0,WACV)
         shModel = wx.ComboBox(Texture,-1,value=textureData['Model'],choices=shModels,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -3703 +3703 @@
         mainSizer.Add((0,5),0)
         if textureData['SHShow']:
-            mainSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonic coefficients: '),0,WACV)
+            mainSizer.Add(wx.StaticText(Texture,-1,' Spherical harmonic coefficients: '),0,WACV)
             mainSizer.Add((0,5),0)
             ODFSizer = wx.FlexGridSizer(0,8,2,2)
@@ -3719 +3719 @@
             mainSizer.Add((0,5),0)
         mainSizer.Add((0,5),0)
-        mainSizer.Add(wx.StaticText(Texture,-1,'Sample orientation angle zeros: '),0,WACV)
+        mainSizer.Add(wx.StaticText(Texture,-1,' Sample orientation angle zeros: '),0,WACV)
         mainSizer.Add((0,5),0)
         angSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -3734 +3734 @@
             angVal.Bind(wx.EVT_TEXT_ENTER,OnAngValue)
             angVal.Bind(wx.EVT_KILL_FOCUS,OnAngValue)
-            angSizer.Add(angVal,0,WACV)
-            angSizer.Add((5,0),0)
-        mainSizer.Add(angSizer,0,WACV)
+            angSizer.Add(angVal,0,WACV|wx.LEFT,5)
+        mainSizer.Add(angSizer,0,WACV|wx.LEFT,5)
         SetPhaseWindow(G2frame.dataFrame,Texture,mainSizer)