Changeset 179

Timestamp:

Nov 20, 2010 10:49:03 AM (12 years ago)

Author:

vondreele

Message:

add new sample environment parameters

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (1 diff)
• GSASIIgrid.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASII.py

@@ -692 +692 @@
                     if Id:
                         Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],'DisplaceX':[0.0,False],
-                            'DisplaceY':[0.0,False],'Diffuse':[]}
+                            'DisplaceY':[0.0,False],'Diffuse':[],'Temperature':300.,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,'Force':0.0}
                         self.PatternTree.SetItemPyData(Id,[[''],[Xsum,Ysum,Wsum,YCsum,YBsum,YDsum]])
                         self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Comments'),Comments)                    

trunk/GSASIIIO.py

@@ -700 +700 @@
         W = np.sqrt(Y)
         Sample = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],'DisplaceX':[0.0,False],
-            'DisplaceY':[0.0,False],'Diffuse':[]}
+            'DisplaceY':[0.0,False],'Diffuse':[],'Temperature':300.,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,'Force':0.0}
         if Id:
             self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,Id, 'Comments'),Comments)                    

trunk/GSASIIgrid.py

@@ -743 +743 @@
         self.PickId = item
         data = self.PatternTree.GetItemPyData(item)
+
+        if 'Temperature' not in data:           #temp fix for old gpx files
+            data = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],'DisplaceX':[0.0,False],
+                'DisplaceY':[0.0,False],'Diffuse':[],'Temperature':300.,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,'Force':0.0}
+            self.PatternTree.SetItemPyData(item,data)
+    
         G2pdG.UpdateSampleGrid(self,data)
         G2plt.PlotPatterns(self)

trunk/GSASIIpwdGUI.py

@@ -423 +423 @@
         parms = [['Shift',' Sample displacement: ','%.4f',],
             ['Transparency',' Sample transparency: ','%.4f'],]
+    parms.append(['Temperature',' Sample temperature: ','%.2f'])
+    parms.append(['Pressure',' Sample pressure: ','%.3f'])
+    parms.append(['Humidity',' Sample humidity: ','%.1f'])
+    parms.append(['Voltage',' Sample voltage: ','%.3f'])
+    parms.append(['Force',' Sample force: ','%.3f'])
     objList = {}
 
@@ -457 +462 @@
         parm = objList[Obj.GetId()]
         try:
-            data[parm[0]][0] = float(Obj.GetValue())
+            if 'list' in str(type(data[parm[0]])): 
+                data[parm[0]][0] = float(Obj.GetValue())
+            else:
+                data[parm[0]] = float(Obj.GetValue())
         except ValueError:
             pass
-        Obj.SetValue(parm[2]%(data[parm[0]][0]))          #reset in case of error
+        if 'list' in str(type(data[parm[0]])): 
+            Obj.SetValue(parm[2]%(data[parm[0]][0]))          #reset in case of error
+        else:
+            Obj.SetValue(parm[2]%(data[parm[0]]))          #reset in case of error
                 
     mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -488 +499 @@
     for parm in parms:
         parmSizer = wx.BoxSizer(wx.HORIZONTAL)
-        parmRef = wx.CheckBox(self.dataDisplay,label=parm[1])
-        objList[parmRef.GetId()] = parm[0]
-        parmRef.SetValue(data[parm[0]][1])
-        parmRef.Bind(wx.EVT_CHECKBOX, OnParmRef)
-        parmSizer.Add(parmRef,0,wx.ALIGN_CENTER_VERTICAL)
-        parmVal = wx.TextCtrl(self.dataDisplay,wx.ID_ANY,
-            parm[2]%(data[parm[0]][0]),style=wx.TE_PROCESS_ENTER)
+        if 'list' in str(type(data[parm[0]])):
+            parmRef = wx.CheckBox(self.dataDisplay,label=parm[1])
+            objList[parmRef.GetId()] = parm[0]
+            parmRef.SetValue(data[parm[0]][1])
+            parmRef.Bind(wx.EVT_CHECKBOX, OnParmRef)
+            parmSizer.Add(parmRef,0,wx.ALIGN_CENTER_VERTICAL)
+            parmVal = wx.TextCtrl(self.dataDisplay,wx.ID_ANY,
+                parm[2]%(data[parm[0]][0]),style=wx.TE_PROCESS_ENTER)
+        else:
+            parmSizer.Add(wx.StaticText(self.dataDisplay,label=parm[1]),
+                0,wx.ALIGN_CENTER_VERTICAL)
+            parmVal = wx.TextCtrl(self.dataDisplay,wx.ID_ANY,
+                parm[2]%(data[parm[0]]),style=wx.TE_PROCESS_ENTER)        
         objList[parmVal.GetId()] = parm
         parmVal.Bind(wx.EVT_TEXT_ENTER,OnParmVal)
@@ -507 +524 @@
     self.dataDisplay.SetSize(Size)
     self.dataFrame.setSizePosLeft(Size)
-    
-    
                 
 def UpdateIndexPeaksGrid(self, data):