Changeset 924
- Timestamp:
- May 17, 2013 5:24:47 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIphsGUI.py
r922 r924 2534 2534 cameraPosTxt = wx.StaticText(drawOptions,-1, 2535 2535 ' Camera Distance: '+'%.2f'%(drawingData['cameraPos']),name='cameraPos') 2536 G2frame.dataDisplay.cameraPosTxt = cameraPosTxt 2536 2537 slideSizer.Add(cameraPosTxt,0,wx.ALIGN_CENTER_VERTICAL) 2537 2538 cameraPos = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['cameraPos'],name='cameraSlider') 2538 2539 cameraPos.SetRange(10,500) 2539 2540 cameraPos.Bind(wx.EVT_SLIDER, OnCameraPos) 2541 G2frame.dataDisplay.cameraSlider = cameraPos 2540 2542 slideSizer.Add(cameraPos,1,wx.EXPAND|wx.RIGHT) 2541 2543 … … 2692 2694 viewPoint = wx.TextCtrl(drawOptions,value='%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]), 2693 2695 style=wx.TE_PROCESS_ENTER,size=wx.Size(140,20),name='viewPoint') 2696 G2frame.dataDisplay.viewPoint = viewPoint 2694 2697 viewPoint.Bind(wx.EVT_TEXT_ENTER,OnViewPoint) 2695 2698 viewPoint.Bind(wx.EVT_KILL_FOCUS,OnViewPoint) -
trunk/GSASIIplot.py
r922 r924 2836 2836 if event.ShiftDown(): 2837 2837 return 2838 drawingData['cameraPos'] += event.GetWheelRotation()/24 2838 drawingData['cameraPos'] += event.GetWheelRotation()/24. 2839 2839 drawingData['cameraPos'] = max(10,min(500,drawingData['cameraPos'])) 2840 2840 G2frame.G2plotNB.status.SetStatusText('New camera distance: %.2f'%(drawingData['cameraPos']),1) … … 2842 2842 if page: 2843 2843 if G2frame.dataDisplay.GetPageText(page) == 'Draw Options': 2844 panel = G2frame.dataDisplay.GetPage(page).GetChildren()[0].GetChildren() 2845 names = [child.GetName() for child in panel] 2846 panel[names.index('cameraPos')].SetLabel('Camera Position: '+'%.2f'%(drawingData['cameraPos'])) 2847 panel[names.index('cameraSlider')].SetValue(drawingData['cameraPos']) 2844 G2frame.dataDisplay.cameraPosTxt.SetLabel('Camera Position: '+'%.2f'%(drawingData['cameraPos'])) 2845 G2frame.dataDisplay.cameraSlider.SetValue(drawingData['cameraPos']) 2848 2846 Draw('wheel') 2849 2847 … … 2859 2857 if page: 2860 2858 if G2frame.dataDisplay.GetPageText(page) == 'Draw Options': 2861 panel = G2frame.dataDisplay.GetPage(page).GetChildren()[0].GetChildren() 2862 names = [child.GetName() for child in panel] 2863 panel[names.index('viewPoint')].SetValue('%.3f %.3f %.3f'%(VP[0],VP[1],VP[2])) 2859 G2frame.dataDisplay.viewPoint.SetValue('%.3f %.3f %.3f'%(VP[0],VP[1],VP[2])) 2864 2860 2865 2861 def SetRBOrigText():
Note: See TracChangeset
for help on using the changeset viewer.