Changeset 4096

Timestamp:

Aug 16, 2019 12:43:05 PM (4 years ago)

Author:

toby

Message:

fix broken plot arrow keys; add some debug for where drag of ticks fails

File:

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

trunk/GSASIIplot.py

@@ -732 +732 @@
 class GSASIItoolbar(Toolbar):
     'Override the matplotlib toolbar so we can add more icons'
-    arrows = {}
-        
     def __init__(self,plotCanvas,publish=None):
         '''Adds additional icons to toolbar'''
+        self.arrows = {}
         # try to remove a button from the bar
         POS_CONFIG_SPLTS_BTN = 6 # position of button to remove
@@ -2014 +2013 @@
         
     def OnMotion(event):
-        
+        'Update the status line with infor based on the mouse position'        
         SetCursor(Page)
         if event.button and G2frame.Contour and G2frame.TforYaxis:
@@ -2392 +2391 @@
             G2frame.cid = None
         if event.xdata is None or event.ydata is None: # ignore drag if cursor is outside of plot
+            if GSASIIpath.GetConfigValue('debug'): print('Ignoring drag, invalid pos:',event.xdata,event.ydata)
             wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             return
         if not G2frame.PickId:
+            if GSASIIpath.GetConfigValue('debug'): print('Ignoring drag, G2frame.PickId is not set')
             return
         
@@ -2440 +2441 @@
         
         if G2frame.itemPicked is None:
-            # after any mouse release event (could be a zoom), redraw magnification lines
+            # after any mouse release event (could be a zoom) where nothing is selected,
+            # redraw magnification lines
             if magLineList: wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             return
@@ -2520 +2522 @@
                 data[1][0] = min(max(data[0][0],data[1][0]),data[1][1])
                 data[1][1] = max(min(data[0][1],data[1][1]),data[1][0])
-        elif (G2frame.GPXtree.GetItemText(PickId) == 'Reflection Lists' or \
+        elif (G2frame.GPXtree.GetItemText(PickId) == 'Reflection Lists' or
             'PWDR' in G2frame.GPXtree.GetItemText(PickId)) and xpos:
             Id = G2gd.GetGPXtreeItemId(G2frame,PatternId,'Reflection Lists')
@@ -2533 +2535 @@
                         else:       #1st row of refl ticks
                             Page.plotStyle['refOffset'] = event.ydata
+        elif GSASIIpath.GetConfigValue('debug'): # should not happen!
+            print('How did we get here?')
+            GSASIIpath.IPyBreak()
         PlotPatterns(G2frame,plotType=plottype,extraKeys=extraKeys)
         G2frame.itemPicked = None