Changeset 267 for trunk/GSASIIimgGUI.py

Timestamp:

Apr 20, 2011 1:09:53 PM (13 years ago)

Author:

vondreele

Message:

removed azm rotation - didn't work
fix azimuthal polarization

File:

• trunk/GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIimgGUI.py

@@ -179 +179 @@
             data['fullIntegrate'] = True
             self.Lazim.SetEditable(False)            
-            self.Razim.SetEditable(False)            
-        G2plt.PlotExposedImage(self,event=event)
-        
-    def OnAzmRot(event):
-        try:
-            azmrot = float(azmRot.GetValue())
-            data['azmthRotate'] = azmrot
-        except ValueError:
-            pass
-        azmRot.SetValue("%.2f" % (data['azmthRotate']))          #reset in case of error          
-        G2plt.PlotExposedImage(self,event=event)
-               
+            self.Razim.SetEditable(False)
+        UpdateImageControls(self,data,masks)            
+        G2plt.PlotExposedImage(self,event=event)
+        
     def OnSetDefault(event):
         import copy
@@ -258 +250 @@
                             id = G2gd.GetPatternTreeItemId(self, self.root, name)
                             Npix,imagefile = self.PatternTree.GetItemPyData(id)
-                            print imagefile
                             image = G2IO.GetImageData(self,imagefile,True)
                             Id = G2gd.GetPatternTreeItemId(self,id, 'Image Controls')
@@ -373 +364 @@
     if 'azmthOff' not in data:
         data['azmthOff'] = 0.0
-    if 'azmthRotate' not in data:
-        data['azmthRotate'] = 0.0       
     #end fix
     
@@ -548 +537 @@
     rotSel.SetBackgroundColour(VERY_LIGHT_GREY)
     dataSizer.Add(rotSel,0,wx.ALIGN_CENTER_VERTICAL)
-    dataSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Bin offset'),0,
-        wx.ALIGN_CENTER_VERTICAL)
-    azmRot = wx.TextCtrl(parent=self.dataDisplay,value=("%.2f" % (data['azmthRotate'])),style=wx.TE_PROCESS_ENTER)
-    azmRot.Bind(wx.EVT_TEXT_ENTER,OnAzmRot)
-    azmRot.Bind(wx.EVT_KILL_FOCUS,OnAzmRot)
-    dataSizer.Add(azmRot,0,wx.ALIGN_CENTER_VERTICAL)
     setDefault = wx.CheckBox(parent=self.dataDisplay,label='Use as default for all images?')
     dataSizer.Add(setDefault,0,wx.ALIGN_CENTER_VERTICAL)