Changeset 2107 for trunk/GSASIIplot.py

Timestamp:

Dec 24, 2015 2:15:40 PM (7 years ago)

Author:

toby

Message:

Bug fix: 6. After changing mask input plot is redrawn reseting limits and sometimes with two scale bars.; zoom is fixed, reason for two scale bars is unclear, but I am taking a guess that recursive calls to PlotImage? could be the problem, wx.CallAfter? added to these.

File:

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

trunk/GSASIIplot.py

@@ -3567 +3567 @@
 
     :param wx.Frame G2frame: The main GSAS-II tree "window"
-    :param str eventkey: a single letter ('f' or 'p') that
+    :param str eventkey: a single letter ('f' or 'p', etc.) that
       determines what type of mask is created.    
     '''
@@ -3600 +3600 @@
     '''Plot of 2D detector images as contoured plot. Also plot calibration ellipses,
     masks, etc.
+
+    :param wx.Frame G2frame: main GSAS-II frame
+    :param bool newPlot: if newPlot is True, the plot is reset (zoomed out, etc.)
+    :param event: matplotlib mouse event (or None)
+    :param bool newImage: If True, the Figure is cleared and redrawn
     '''
     from matplotlib.patches import Ellipse,Arc,Circle,Polygon
@@ -3670 +3675 @@
                 G2frame.MaskKey = event.key
                 OnStartMask(G2frame)
-                PlotImage(G2frame,newPlot=False)
+                wx.CallAfter(PlotImage,G2frame,newImage=False)
                 
         elif PickName == 'Stress/Strain':
@@ -3676 +3681 @@
                 G2frame.StrainKey = event.key
                 StrSta = OnStartNewDzero(G2frame)
-                PlotImage(G2frame,newPlot=False)
+                wx.CallAfter(PlotImage,G2frame,newImage=False)
                 
         elif PickName == 'Image Controls':
@@ -3691 +3696 @@
                         Data['center'] = [Xpos,Ypos]
                         G2imG.UpdateImageControls(G2frame,Data,Masks)
-                        PlotImage(G2frame,newPlot=False)
+                        wx.CallAfter(PlotImage,G2frame,newPlot=False)
                 finally:
                     dlg.Destroy()
@@ -3701 +3706 @@
             elif event.key in ['y',]:
                 Data['invert_y'] = not Data['invert_y']
-            PlotImage(G2frame,newPlot=True)
+            wx.CallAfter(PlotImage,G2frame,newPlot=True)
             
     def OnKeyBox(event):
@@ -3758 +3763 @@
                     G2imG.UpdateImageControls(G2frame,Data,Masks)
                     return
-                PlotImage(G2frame,newImage=False)
+                wx.CallAfter(PlotImage,G2frame,newImage=False)
             return
         elif G2frame.MaskKey and PickName == 'Masks':
@@ -3797 +3802 @@
                     frame.append([Xpos,Ypos])
             G2imG.UpdateMasks(G2frame,Masks)
-            PlotImage(G2frame,newImage=False)
+            wx.CallAfter(PlotImage,G2frame,newImage=False)
         elif PickName == 'Stress/Strain' and G2frame.StrainKey:
             Xpos,Ypos = [event.xdata,event.ydata]
@@ -3813 +3818 @@
             G2imG.UpdateStressStrain(G2frame,StrSta)
             PlotStrain(G2frame,StrSta)
-            PlotImage(G2frame,newPlot=False)            
+            wx.CallAfter(PlotImage,G2frame,newPlot=False)            
         else:
             Xpos,Ypos = [event.xdata,event.ydata]
@@ -3907 +3912 @@
 #                else:                  #keep for future debugging
 #                    print str(G2frame.itemPicked),event.xdata,event.ydata,event.button
-            PlotImage(G2frame,newImage=True)
+            wx.CallAfter(PlotImage,G2frame,newImage=True)
             G2frame.itemPicked = None
             
@@ -3999 +4004 @@
     wx.BeginBusyCursor()
     try:
-            
         if newImage:                    
             Imin,Imax = Data['range'][1]