Changeset 49 for trunk/GSASIIgrid.py

Timestamp:

Apr 20, 2010 1:10:20 PM (13 years ago)

Author:

vondreel

Message:

resolved zoom issues with peak picking, etc.
further steps for image integration

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,
-] = [wx.NewId() for _init_coll_IMAGE_Items in range(3)]
+[ wxID_IMCALIBRATE, wxID_IMINTEGRATE, wxID_IMCLEARCALIB, wxID_IMREFRESHTA,
+] = [wx.NewId() for _init_coll_IMAGE_Items in range(4)]
 
 [ 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')
+        
             
     def _init_coll_Peak_Items(self,parent):
@@ -1133 +1135 @@
         try:
             numChans = int(outChan.GetValue())
+            if numChans < 1:
+                raise ValueError
             data['outChannels'] = numChans
         except ValueError:
@@ -1138 +1142 @@
         outChan.SetValue(str(data['outChannels']))          #reset in case of error        
         
+    def OnNumOutAzms(event):
+        try:
+            numAzms = int(outAzim.GetValue())
+            if numAzms < 1:
+                raise ValueError
+            data['outAzimuths'] = numAzms            
+        except ValueError:
+            pass
+        outAzim.SetValue(str(data['outAzimuths']))          #reset in case of error        
+        
     def OnWavelength(event):
         try:
             wave = float(waveSel.GetValue())
+            if wave < .01:
+                raise ValueError
             data['wavelength'] = wave
         except ValueError:
@@ -1194 +1210 @@
         Lazm = int(self.Lazim.GetValue())
         Razm = int(self.Razim.GetValue())
-#        if Lazm > Razm:
-#            G2cmp.SwapXY(Lazm,Razm)
         data['LRazimuth'] = [Lazm,Razm]
         G2plt.PlotImage(self)
@@ -1237 +1251 @@
                     
     def OnIntegrate(event):
-        print 'image integrate'
+        G2cmp.ImageIntegrate(self,data)
+        
+    def OnRefreshTA(event):
+        G2plt.PlotTRImage(self)        
         
     colorList = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
@@ -1248 +1265 @@
     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)
@@ -1284 +1302 @@
     comboSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Pixel search range '),0,
         wx.ALIGN_CENTER_VERTICAL)
-    pixLimit = wx.ComboBox(parent=self.dataDisplay,value=str(data['pixLimit']),choices=['5','10','15','20'],
+    pixLimit = wx.ComboBox(parent=self.dataDisplay,value=str(data['pixLimit']),choices=['1','2','5','10','15','20'],
         style=wx.CB_READONLY|wx.CB_DROPDOWN)
     pixLimit.Bind(wx.EVT_COMBOBOX, OnPixLimit)
@@ -1314 +1332 @@
     dataSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Inner/Outer 2-theta'),0,
         wx.ALIGN_CENTER_VERTICAL)
-    if 'IOtth' not in data:                 #temporary fix
+        
+    #temporary fixes    
+    if 'IOtth' not in data:                 
         del data['IOradii']
         data['IOtth'] = [2.0,5.0]
+    if 'outAzimuths' not in data:
+        data['outAzimuths'] = 1        
+        
     IOtth = data['IOtth']
     littleSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -1355 +1378 @@
     dataSizer.Add(distSel,0,wx.ALIGN_CENTER_VERTICAL)
 
-    dataSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' No. bins'),0,
+    dataSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' No. 2-theta/azimuth bins'),0,
         wx.ALIGN_CENTER_VERTICAL)
+    littleSizer = wx.BoxSizer(wx.HORIZONTAL)
     outChan = wx.TextCtrl(parent=self.dataDisplay,value=str(data['outChannels']),style=wx.TE_PROCESS_ENTER)
     outChan.Bind(wx.EVT_TEXT_ENTER,OnNumOutChans)
-    dataSizer.Add(outChan,0,wx.ALIGN_CENTER_VERTICAL)
+    littleSizer.Add(outChan,0,wx.ALIGN_CENTER_VERTICAL)
+    outAzim = wx.TextCtrl(parent=self.dataDisplay,value=str(data['outAzimuths']),style=wx.TE_PROCESS_ENTER)
+    outAzim.Bind(wx.EVT_TEXT_ENTER,OnNumOutAzms)
+    littleSizer.Add(outAzim,0,wx.ALIGN_CENTER_VERTICAL)
+    dataSizer.Add(littleSizer,0,)
 
     dataSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Tilt angle'),0,
@@ -1802 +1830 @@
         elif 'PKS' in self.PatternTree.GetItemText(item):
             G2plt.PlotPowderLines(self)
-        elif 'PWDR' in self.PatternTree.GetItemText(item):
-            G2plt.PlotPatterns(self)
+        elif 'PWDR' in self.PatternTree.GetItemText(item):            
+            G2plt.PlotPatterns(self,True)
         elif 'SXTL' in self.PatternTree.GetItemText(item):
             self.Sngl = item