Changeset 759

Timestamp:

Sep 17, 2012 2:38:13 AM (11 years ago)

Author:

vondreele

Message:

fix excessive redraws of structure - no redraw on setfocus

File:

• trunk/GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIplot.py

@@ -2443 +2443 @@
             SetPeakRoll(dirDict[key])
             SetMapPeaksText(mapPeaks)
-        Draw()
+        Draw('key')
             
     def GetTruePosition(xy,Add=False):
@@ -2511 +2511 @@
                 Q = drawingData['Quaternion']
                 G2frame.G2plotNB.status.SetStatusText('New quaternion: %.2f+, %.2fi+ ,%.2fj+, %.2fk'%(Q[0],Q[1],Q[2],Q[3]),1)
-            Draw()
+            Draw('move')
         
     def OnMouseWheel(event):
@@ -2526 +2526 @@
                 panel[names.index('cameraPos')].SetLabel('Camera Position: '+'%.2f'%(drawingData['cameraPos']))
                 panel[names.index('cameraSlider')].SetValue(drawingData['cameraPos'])
-            Draw()
+            Draw('wheel')
         
     def getSelection():
@@ -2885 +2885 @@
         RenderDots(XYZ,RC)
                             
-    def Draw():
+    def Draw(caller=''):
+#useful debug?        
+#        if caller:
+#            print caller
+# end of useful debug
         mapData = generalData['Map']
         pageName = ''
@@ -3059 +3063 @@
        
     def OnSize(event):
-        Draw()
-        
-    def OnFocus(event):
-        Draw()
+        Draw('size')
+        
+    def OnFocus(event):         #not needed?? Bind commented out below
+        Draw('focus')
         
     try:
@@ -3089 +3093 @@
     Page.canvas.Bind(wx.EVT_MOTION, OnMouseMove)
     Page.canvas.Bind(wx.EVT_SIZE, OnSize)
-    Page.canvas.Bind(wx.EVT_SET_FOCUS, OnFocus)
+#    Page.canvas.Bind(wx.EVT_SET_FOCUS, OnFocus)
     Page.camera['position'] = drawingData['cameraPos']
     Page.camera['viewPoint'] = np.inner(Amat,drawingData['viewPoint'][0])
     Page.camera['backColor'] = np.array(list(drawingData['backColor'])+[0,])/255.
     Page.canvas.SetCurrent()
-    Draw()
-        
+    Draw('main')
+