Changeset 51 for trunk/GSASIIgrid.py

Timestamp:

Apr 22, 2010 3:17:01 PM (13 years ago)

Author:

vondreel

Message:

integration working & plotted

File:

• trunk/GSASIIgrid.py (modified) (11 diffs)

trunk/GSASIIgrid.py

@@ -20 +20 @@
 ] = [wx.NewId() for _init_coll_Atom_Items in range(2)]
 
-[ wxID_IMCALIBRATE, wxID_IMINTEGRATE, wxID_IMCLEARCALIB, wxID_IMREFRESHTA,
-] = [wx.NewId() for _init_coll_IMAGE_Items in range(4)]
+[ wxID_IMCALIBRATE, wxID_IMINTEGRATE, wxID_IMCLEARCALIB, 
+] = [wx.NewId() for _init_coll_IMAGE_Items in range(3)]
 
 [ wxID_UNDO,wxID_PEAKFIT,wxID_AUTOPEAKFIT,
@@ -54 +54 @@
         parent.Append(help='',id=wxID_IMCLEARCALIB, kind=wx.ITEM_NORMAL,text='Clear calibration')
         parent.Append(help='',id=wxID_IMINTEGRATE, kind=wx.ITEM_NORMAL,text='Integrate')
-        parent.Append(help='',id=wxID_IMREFRESHTA, kind=wx.ITEM_NORMAL,text='Refresh transformed image')
         
             
@@ -1112 +1111 @@
     def OnNewColorBar(event):
         data['color'] = colSel.GetValue()
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
         
     def OnNewCalibrant(event):
@@ -1124 +1123 @@
         delt = data['range'][0][1]-data['range'][0][0]
         data['range'][1][1] = int((imax/100.)*delt)+data['range'][0][0]
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
         
     def OnMinSlider(event):
@@ -1130 +1129 @@
         delt = data['range'][1][1]-data['range'][0][0]
         data['range'][1][0] = int((imin/100.)*delt)+data['range'][0][0]
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
         
     def OnNumOutChans(event):
@@ -1175 +1174 @@
         else:
             data['showLines'] = True
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
         
     def OnFullIntegrate(event):
@@ -1186 +1185 @@
             self.Lazim.SetEditable(False)            
             self.Razim.SetEditable(False)            
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
         
     def OnSetDefault(event):
@@ -1205 +1204 @@
         self.InnerTth.SetValue("%8.2f" % (Ltth))
         self.OuterTth.SetValue("%8.2f" % (Utth))
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
         
     def OnLRazim(event):
@@ -1211 +1210 @@
         Razm = int(self.Razim.GetValue())
         data['LRazimuth'] = [Lazm,Razm]
-        G2plt.PlotImage(self)
+        G2plt.PlotExposedImage(self)
             
     def OnSetRings(event):
@@ -1253 +1252 @@
         G2cmp.ImageIntegrate(self,data)
         
-    def OnRefreshTA(event):
-        G2plt.PlotTRImage(self)        
-        
     colorList = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
     calList = [m for m in calFile.Calibrants.keys()]
@@ -1265 +1261 @@
     self.dataFrame.Bind(wx.EVT_MENU, OnClearCalib, id=wxID_IMCLEARCALIB)    
     self.dataFrame.Bind(wx.EVT_MENU, OnIntegrate, id=wxID_IMINTEGRATE)        
-    self.dataFrame.Bind(wx.EVT_MENU, OnRefreshTA, id=wxID_IMREFRESHTA)        
     self.dataDisplay = wx.Panel(self.dataFrame)
     mainSizer = wx.BoxSizer(wx.VERTICAL)