Changeset 365

Timestamp:

Sep 7, 2011 3:46:10 PM (12 years ago)

Author:

vondreele

Message:

fixed to make size & mustrain sizers work (maybe just better).
Issue is with wx.CheckBox?

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (6 diffs)
• GSASIIstruct.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -527 +527 @@
         
     def OnConvergence(event):
-        Obj = event.GetObject()
         try:
-            value = max(1.e-9,min(1.0,float(Obj.GetValue())))
+            value = max(1.e-9,min(1.0,float(Cnvrg.GetValue())))
         except ValueError:
             value = 0.0001
         data['min dM/M'] = value
-        Obj.SetValue('%.2g'%(value))
+        Cnvrg.SetValue('%.2g'%(value))
         
     def OnDerivType(event):
-        Obj = event.GetObject()
-        data['deriv type'] = Obj.GetValue()
+        data['deriv type'] = derivSel.GetValue()
         derivSel.SetValue(data['deriv type'])
         
     def OnFactor(event):
-        Obj = event.GetObject()
         try:
-            value = min(max(float(Obj.GetValue()),0.001),100.)
+            value = min(max(float(Factr.GetValue()),0.001),100.)
         except ValueError:
             value = 1.0
         data['shift factor'] = value
-        Obj.SetValue('%.3f'%(value))
+        Factr.SetValue('%.3f'%(value))
         
     if self.dataDisplay:

trunk/GSASIIphsGUI.py

@@ -2314 +2314 @@
                 if UseList[item]['Size'][0] == 'isotropic':
                     sizeRef = wx.CheckBox(dataDisplay,-1,label=' Cryst. size: ')
+                    sizeRef.thisown = False
                     sizeRef.SetValue(UseList[item]['Size'][2][0])
                     Indx[sizeRef.GetId()] = [item,0]
@@ -2319 +2320 @@
                     sizeSizer.Add(sizeRef,0,wx.ALIGN_CENTER_VERTICAL)
                     sizeVal = wx.TextCtrl(dataDisplay,wx.ID_ANY,
-                        '%.1f'%(UseList[item]['Size'][1][0]),style=wx.TE_PROCESS_ENTER)
+                        '%.2f'%(UseList[item]['Size'][1][0]),style=wx.TE_PROCESS_ENTER)
                     Indx[sizeVal.GetId()] = [item,0]
                     sizeVal.Bind(wx.EVT_TEXT_ENTER,OnSizeVal)
@@ -2341 +2342 @@
                     for Pa,val,ref,id in parms:
                         sizeRef = wx.CheckBox(dataDisplay,-1,label=Pa)
+                        sizeRef.thisown = False
                         sizeRef.SetValue(ref)
                         Indx[sizeRef.GetId()] = [item,id]
                         sizeRef.Bind(wx.EVT_CHECKBOX, OnSizeRef)
                         sizeSizer2.Add(sizeRef,0,wx.ALIGN_CENTER_VERTICAL)
-                        sizeVal = wx.TextCtrl(dataDisplay,wx.ID_ANY,'%.1f'%(val),style=wx.TE_PROCESS_ENTER)
+                        sizeVal = wx.TextCtrl(dataDisplay,wx.ID_ANY,'%.2f'%(val),style=wx.TE_PROCESS_ENTER)
                         Indx[sizeVal.GetId()] = [item,id]
                         sizeVal.Bind(wx.EVT_TEXT_ENTER,OnSizeVal)
@@ -2362 +2364 @@
                     for Pa,val,ref,id in parms:
                         sizeRef = wx.CheckBox(dataDisplay,-1,label=Pa)
+                        sizeRef.thisown = False
                         sizeRef.SetValue(ref)
                         Indx[sizeRef.GetId()] = [item,id]
                         sizeRef.Bind(wx.EVT_CHECKBOX, OnSizeRef)
                         sizeSizer3.Add(sizeRef,0,wx.ALIGN_CENTER_VERTICAL)
-                        sizeVal = wx.TextCtrl(dataDisplay,wx.ID_ANY,'%.1f'%(val),style=wx.TE_PROCESS_ENTER)
+                        sizeVal = wx.TextCtrl(dataDisplay,wx.ID_ANY,'%.2f'%(val),style=wx.TE_PROCESS_ENTER)
                         Indx[sizeVal.GetId()] = [item,id]
                         sizeVal.Bind(wx.EVT_TEXT_ENTER,OnSizeVal)
@@ -2411 +2414 @@
                     for Pa,val,ref,id in parms:
                         strainRef = wx.CheckBox(dataDisplay,-1,label=Pa)
+                        strainRef.thisown = False
                         strainRef.SetValue(ref)
                         Indx[strainRef.GetId()] = [item,id]
@@ -2433 +2437 @@
                         UseList[item]['Mustrain'][5] = numb*[False,]
                     parms = zip(Snames,UseList[item]['Mustrain'][4],UseList[item]['Mustrain'][5],range(numb))
-                    strainSizer = wx.FlexGridSizer(numb%3+1,6,5,5)
+                    strainSizer = wx.FlexGridSizer(1,6,5,5)
                     for Pa,val,ref,id in parms:
                         strainRef = wx.CheckBox(dataDisplay,-1,label=Pa)
+                        strainRef.thisown = False
                         strainRef.SetValue(ref)
                         Indx[strainRef.GetId()] = [item,id]

trunk/GSASIIstruct.py

@@ -1082 +1082 @@
             gam = (1.8*wave/np.pi)/parmDict[phfx+'Size:0']*parmDict[phfx+'Size:1']
             gam *= np.sqrt((cosP*parmDict[phfx+'Size:1'])**2+(sinP*parmDict[phfx+'Size:0'])**2)/costh
-        else:           #ellipsoidal crystallites
+        else:           #ellipsoidal crystallites - wrong not make sense
             H = np.array(refl[:3])
             gam += 1.8*wave/(np.pi*costh*np.inner(H,np.inner(sizeEllipse,H)))            
@@ -1211 +1211 @@
             Si = parmDict[phfx+'Size:0']
             Sa = parmDict[phfx+'Size:1']
-            gami = (180.*wave/np.pi)/(Si*Sa)
+            gami = (1.80*wave/np.pi)/(Si*Sa)
             sqtrm = np.sqrt((cosP*Sa)**2+(sinP*Si)**2)
             gam = gami*sqtrm/costh            
             gamDict[phfx+'Size:0'] = gami*Si*sinP**2/(sqtrm*costh)-gam/Si
             gamDict[phfx+'Size:1'] = gam/Sa-gami*Sa*cosP**2/(sqtrm*costh)         
-        else:           #ellipsoidal crystallites - do numerically?
+        else:           #ellipsoidal crystallites - do numerically? - not right not make sense
             H = np.array(refl[:3])
             gam = 1.8*wave/(np.pi*costh*np.inner(H,np.inner(sizeEllipse,H)))
@@ -1537 +1537 @@
     SetUsedHistogramsAndPhases(GPXfile,Histograms,Phases)
 #for testing purposes!!!
-#    import cPickle
-#    file = open('structTestdata.dat','wb')
-#    cPickle.dump(parmDict,file,1)
-#    cPickle.dump(varyList,file,1)
-#    for histogram in Histograms:
-#        if 'PWDR' in histogram[:4]:
-#            Histogram = Histograms[histogram]
-#    cPickle.dump(Histogram,file,1)
-#    cPickle.dump(Phases,file,1)
-#    cPickle.dump(calcControls,file,1)
-#    cPickle.dump(pawleyLookup,file,1)
-#    file.close()
+    import cPickle
+    file = open('structTestdata.dat','wb')
+    cPickle.dump(parmDict,file,1)
+    cPickle.dump(varyList,file,1)
+    for histogram in Histograms:
+        if 'PWDR' in histogram[:4]:
+            Histogram = Histograms[histogram]
+    cPickle.dump(Histogram,file,1)
+    cPickle.dump(Phases,file,1)
+    cPickle.dump(calcControls,file,1)
+    cPickle.dump(pawleyLookup,file,1)
+    file.close()
 
 def main():