Changeset 124

Timestamp:

Jul 19, 2010 8:09:34 AM (13 years ago)

Author:

vondreel

Message:

Integrate All fixes

File:

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

trunk/GSASIIimgGUI.py

@@ -172 +172 @@
                     
     def OnIntegrate(event):
-        G2img.ImageIntegrate(self,data,masks)
+        self.Integrate = G2img.ImageIntegrate(self.ImageZ,data,masks)
         G2plt.PlotIntegration(self,newPlot=True)
         self.dataFrame.ImageEdit.Enable(id=G2gd.wxID_SAVEINTG,enable=True)
@@ -200 +200 @@
                             id = G2gd.GetPatternTreeItemId(self, self.root, name)
                             size,imagefile = self.PatternTree.GetItemPyData(id)
-                            self.ImageZ = G2IO.GetImageData(imagefile,imageOnly=True)
+                            image = G2IO.GetImageData(imagefile,imageOnly=True)
                             Id = G2gd.GetPatternTreeItemId(self,id, 'Image Controls')
                             Data = self.PatternTree.GetItemPyData(Id)
@@ -211 +211 @@
                                 self.PatternTree.SetItemPyData(
                                     G2gd.GetPatternTreeItemId(self,self.Image, 'Masks'),Masks)                                
-                            G2img.ImageIntegrate(self,Data,Masks)
+                            self.Integrate = G2img.ImageIntegrate(image,Data,Masks)
                             G2plt.PlotIntegration(self,newPlot=True,event=event)
                             self.dataFrame.ImageEdit.Enable(id=G2gd.wxID_SAVEINTG,enable=True)