Changeset 827

Timestamp:

Jan 11, 2013 2:55:47 PM (9 years ago)

Author:

vondreele

Message:

added gonio angles to image GUI for transfer to powder data sample GUI with integration

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASII.py

@@ -1221 +1221 @@
                             Data['ellipses'] = []
                             Data['calibrant'] = ''
+                            Data['GonioAngles'] = [0.,0.,0.]
                         else:
                             Data['type'] = 'PWDR'
@@ -1235 +1236 @@
                             Data['edgemin'] = 100000000
                             Data['ellipses'] = []
+                            Data['GonioAngles'] = [0.,0.,0.]
                             Data['calibrant'] = ''
                             Data['IOtth'] = [2.0,5.0]

trunk/GSASIIIO.py

@@ -579 +579 @@
         Sample = G2pdG.SetDefaultSample()
         Sample['Gonio. radius'] = data['distance']
+        Sample['Omega'] = data['GonioAngles'][0]
+        Sample['Chi'] = data['GonioAngles'][1]
+        Sample['Phi'] = data['GonioAngles'][2]
         if Id:
             G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id, 'Comments'),Comments)                    

trunk/GSASIIimgGUI.py

@@ -35 +35 @@
 def UpdateImageControls(G2frame,data,masks):
     import ImageCalibrants as calFile
+#patch
+    if 'GonioAngles' not in data:
+        data['GonioAngles'] = [0.,0.,0.]
+#end patch
+
     
 # Menu items
@@ -163 +168 @@
                             oldData = copy.deepcopy(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Image Controls')))
                             Data['range'] = oldData['range']
-                            Data['size'] = oldData['size']                                
+                            Data['size'] = oldData['size']
+                            Data['GonioAngles'] = oldData['GonioAngles']
                             Data['ring'] = []
                             Data['rings'] = []
@@ -695 +701 @@
         return calibSizer
         
+    def GonioSizer():
+        
+        ValObj = {}
+        
+        def OnGonioAngle(event):
+            Obj = event.GetEventObject()
+            item = ValObj[Obj.GetId()]
+            try:
+                value = float(Obj.GetValue())
+            except ValueError:
+                value = data['GonioAngles'][item]
+            data['GonioAngles'][item] = value
+            Obj.SetValue('%8.2f'%(value))
+        
+        gonioSizer = wx.BoxSizer(wx.HORIZONTAL)
+        names = ['Omega','Chi','Phi']
+        gonioSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,'Sample goniometer angles: '),0,wx.ALIGN_CENTER_VERTICAL)
+        for i,name in enumerate(names):
+            gonioSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,name),0,wx.ALIGN_CENTER_VERTICAL)
+            angle = wx.TextCtrl(G2frame.dataDisplay,-1,value='%8.2f'%(data['GonioAngles'][i]),
+                style=wx.TE_PROCESS_ENTER)
+            angle.Bind(wx.EVT_TEXT_ENTER,OnGonioAngle)
+            angle.Bind(wx.EVT_KILL_FOCUS,OnGonioAngle)
+            ValObj[angle.GetId()] = i
+            gonioSizer.Add(angle,0,wx.ALIGN_CENTER_VERTICAL)
+        return gonioSizer
+        
 # Image Controls main code             
                             
@@ -749 +782 @@
     mainSizer.Add((5,5),0)
     mainSizer.Add(CalibSizer(),0,wx.ALIGN_CENTER_VERTICAL)
+    mainSizer.Add((5,5),0)
+    mainSizer.Add(GonioSizer(),0,wx.ALIGN_CENTER_VERTICAL)   
         
     mainSizer.Layout()