Changeset 2436
- Timestamp:
- Aug 19, 2016 9:13:58 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIIO.py
r2433 r2436 323 323 Data['calibrant'] = '' 324 324 Data['IOtth'] = [2.0,5.0] 325 Data['LRazimuth'] = [ 135,225]325 Data['LRazimuth'] = [0.,180.] 326 326 Data['azmthOff'] = 0.0 327 327 Data['outChannels'] = 2500 -
trunk/GSASIIimgGUI.py
r2431 r2436 684 684 def OnLRazim(event): 685 685 event.Skip() 686 Lazm = int(G2frame.Lazim.GetValue())%360687 Razm = int(G2frame.Razim.GetValue())%360686 Lazm = float(G2frame.Lazim.GetValue())%360. 687 Razm = float(G2frame.Razim.GetValue())%360. 688 688 if Lazm > Razm: 689 Razm += 360 689 Razm += 360. 690 690 if data['fullIntegrate']: 691 Razm = Lazm+360 692 G2frame.Lazim.SetValue("%6 d" % (Lazm))693 G2frame.Razim.SetValue("%6 d" % (Razm))691 Razm = Lazm+360. 692 G2frame.Lazim.SetValue("%6.1f" % (Lazm)) 693 G2frame.Razim.SetValue("%6.1f" % (Razm)) 694 694 data['LRazimuth'] = [Lazm,Razm] 695 695 wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event) … … 767 767 if data['fullIntegrate']: 768 768 data['fullIntegrate'] = False 769 data['LRazimuth'] = [Lazm,Lazm+20 ]769 data['LRazimuth'] = [Lazm,Lazm+20.] 770 770 else: 771 771 data['fullIntegrate'] = True 772 data['LRazimuth'] = [Lazm,Lazm+360 ]772 data['LRazimuth'] = [Lazm,Lazm+360.] 773 773 wx.CallLater(100,UpdateImageControls,G2frame,data,masks) 774 774 G2plt.PlotExposedImage(G2frame,event=event) … … 837 837 littleSizer = wx.BoxSizer(wx.HORIZONTAL) 838 838 G2frame.Lazim = wx.TextCtrl(parent=G2frame.dataDisplay, 839 value=("%6 d" % (LRazim[0])),style=wx.TE_PROCESS_ENTER)839 value=("%6.1f" % (LRazim[0])),style=wx.TE_PROCESS_ENTER) 840 840 G2frame.Lazim.Bind(wx.EVT_TEXT_ENTER,OnLRazim) 841 841 G2frame.Lazim.Bind(wx.EVT_KILL_FOCUS,OnLRazim) 842 842 littleSizer.Add(G2frame.Lazim,0,WACV) 843 843 G2frame.Razim = wx.TextCtrl(parent=G2frame.dataDisplay, 844 value=("%6 d" % (LRazim[1])),style=wx.TE_PROCESS_ENTER)844 value=("%6.1f" % (LRazim[1])),style=wx.TE_PROCESS_ENTER) 845 845 G2frame.Razim.Bind(wx.EVT_TEXT_ENTER,OnLRazim) 846 846 G2frame.Razim.Bind(wx.EVT_KILL_FOCUS,OnLRazim) … … 848 848 G2frame.Razim.Enable(False) 849 849 G2frame.Razim.SetBackgroundColour(VERY_LIGHT_GREY) 850 G2frame.Razim.SetValue("%6 d" % (LRazim[0]+360))850 G2frame.Razim.SetValue("%6.1f" % (LRazim[0]+360.)) 851 851 littleSizer.Add(G2frame.Razim,0,WACV) 852 852 dataSizer.Add(littleSizer,0,) … … 2158 2158 finally: 2159 2159 File.close() 2160 if fullIntegrate: save['LRazimuth_min'],save['LRazimuth_max'] = 0 ,02160 if fullIntegrate: save['LRazimuth_min'],save['LRazimuth_max'] = 0.,0. 2161 2161 return save 2162 2162 -
trunk/GSASIIplot.py
r2428 r2436 4465 4465 dspO = wave/(2.0*sind(IOtth[1]/2.0)) 4466 4466 ellO = G2img.GetEllipse(dspO,Data) #Ditto & more likely for outer ellipse 4467 Azm = np.ar ray(range(LRAzim[0],LRAzim[1]+1))-AzmthOff4467 Azm = np.arange(LRAzim[0],LRAzim[1]+1.)-AzmthOff 4468 4468 if ellI: 4469 4469 xyI = []
Note: See TracChangeset
for help on using the changeset viewer.