Changeset 924

Timestamp:

May 17, 2013 5:24:47 PM (9 years ago)

Author:

toby

Message:

plot fixes: save more Draw Options widgets & reference directly; fix mousewheel on mac, where smaller movements are possible

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -2534 +2534 @@
             cameraPosTxt = wx.StaticText(drawOptions,-1,
                 ' Camera Distance: '+'%.2f'%(drawingData['cameraPos']),name='cameraPos')
+            G2frame.dataDisplay.cameraPosTxt = cameraPosTxt
             slideSizer.Add(cameraPosTxt,0,wx.ALIGN_CENTER_VERTICAL)
             cameraPos = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['cameraPos'],name='cameraSlider')
             cameraPos.SetRange(10,500)
             cameraPos.Bind(wx.EVT_SLIDER, OnCameraPos)
+            G2frame.dataDisplay.cameraSlider = cameraPos
             slideSizer.Add(cameraPos,1,wx.EXPAND|wx.RIGHT)
             
@@ -2692 +2694 @@
             viewPoint = wx.TextCtrl(drawOptions,value='%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]),
                 style=wx.TE_PROCESS_ENTER,size=wx.Size(140,20),name='viewPoint')
+            G2frame.dataDisplay.viewPoint = viewPoint
             viewPoint.Bind(wx.EVT_TEXT_ENTER,OnViewPoint)
             viewPoint.Bind(wx.EVT_KILL_FOCUS,OnViewPoint)

trunk/GSASIIplot.py

@@ -2836 +2836 @@
         if event.ShiftDown():
             return
-        drawingData['cameraPos'] += event.GetWheelRotation()/24
+        drawingData['cameraPos'] += event.GetWheelRotation()/24.
         drawingData['cameraPos'] = max(10,min(500,drawingData['cameraPos']))
         G2frame.G2plotNB.status.SetStatusText('New camera distance: %.2f'%(drawingData['cameraPos']),1)
@@ -2842 +2842 @@
         if page:
             if G2frame.dataDisplay.GetPageText(page) == 'Draw Options':
-                panel = G2frame.dataDisplay.GetPage(page).GetChildren()[0].GetChildren()
-                names = [child.GetName() for child in panel]
-                panel[names.index('cameraPos')].SetLabel('Camera Position: '+'%.2f'%(drawingData['cameraPos']))
-                panel[names.index('cameraSlider')].SetValue(drawingData['cameraPos'])
+                G2frame.dataDisplay.cameraPosTxt.SetLabel('Camera Position: '+'%.2f'%(drawingData['cameraPos']))
+                G2frame.dataDisplay.cameraSlider.SetValue(drawingData['cameraPos'])
             Draw('wheel')
         
@@ -2859 +2857 @@
         if page:
             if G2frame.dataDisplay.GetPageText(page) == 'Draw Options':
-                panel = G2frame.dataDisplay.GetPage(page).GetChildren()[0].GetChildren()
-                names = [child.GetName() for child in panel]
-                panel[names.index('viewPoint')].SetValue('%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]))
+                G2frame.dataDisplay.viewPoint.SetValue('%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]))
                 
     def SetRBOrigText():