Changeset 440 for trunk/GSASIIimgGUI.py

Timestamp:

Dec 11, 2011 1:55:19 PM (11 years ago)

Author:

vondreele

Message:

fix the mustrain ve microstrain title problem = GSASII.py
take wx,CallAfter? back out of most places - caused problems
get aniso size/mustrain ellipsoid around the right way to match ellipsoid model - exchanged sin & cos.

File:

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

trunk/GSASIIimgGUI.py

@@ -17 +17 @@
 import GSASIIIO as G2IO
 import GSASIIgrid as G2gd
+import numpy as np
 
 VERY_LIGHT_GREY = wx.Colour(235,235,235)
@@ -197 +198 @@
             data['fullIntegrate'] = True
             data['LRazimuth'] = [Lazm,Lazm+360]
-        wx.CallAfter(UpdateImageControls,self,data,masks)
+        UpdateImageControls(self,data,masks)
         G2plt.PlotExposedImage(self,event=event)
         
@@ -235 +236 @@
     def OnRecalibrate(event):
         G2img.ImageRecalibrate(self,data)
-        wx.CallAfter(UpdateImageControls,self,data,masks)
+        UpdateImageControls(self,data,masks)
         
     def OnIntegrate(event):
@@ -245 +246 @@
             Npix,imagefile = self.PatternTree.GetItemPyData(id)
             backImage = G2IO.GetImageData(self,imagefile,True)*backScale
-            self.Integrate = G2img.ImageIntegrate(self.ImageZ+backImage,data,masks)
+            sumImage = self.ImageZ+backImage
+            print sumImage.shape,np.min(sumImage),np.max(sumImage)
+            self.Integrate = G2img.ImageIntegrate(sumImage,data,masks)
         else:
             self.Integrate = G2img.ImageIntegrate(self.ImageZ,data,masks)
@@ -399 +402 @@
                     S = File.readline()
                 data.update(save)
-                wx.CallAfter(UpdateImageControls,self,data,masks)
+                UpdateImageControls(self,data,masks)
                 G2plt.PlotExposedImage(self,event=event)
                 
@@ -709 +712 @@
         Obj = event.GetEventObject()
         del(data['Points'][delSpotId.index(Obj)])
-        wx.CallAfter(UpdateMasks,self,data)
+        UpdateMasks(self,data)
         G2plt.PlotExposedImage(self,event=event)
         
@@ -725 +728 @@
         Obj = event.GetEventObject()
         del(data['Rings'][delRingId.index(Obj)])
-        wx.CallAfter(UpdateMasks,self,data)
+        UpdateMasks(self,data)
         G2plt.PlotExposedImage(self,event=event)
 
@@ -741 +744 @@
         Obj = event.GetEventObject()
         del(data['Arcs'][delArcId.index(Obj)])
-        wx.CallAfter(UpdateMasks,self,data)
+        UpdateMasks(self,data)
         G2plt.PlotExposedImage(self,event=event)
 
@@ -747 +750 @@
         Obj = event.GetEventObject()
         del(data['Polygons'][delPolyId.index(Obj)])
-        wx.CallAfter(UpdateMasks,self,data)
+        UpdateMasks(self,data)
         G2plt.PlotExposedImage(self,event=event)
 
@@ -823 +826 @@
                     S = File.readline()
                 data.update(save)
-                wx.CallAfter(UpdateMasks,self,data)
+                UpdateMasks(self,data)
                 G2plt.PlotExposedImage(self,event=event)