Changeset 4787 for trunk

Timestamp:

Jan 29, 2021 6:14:00 PM (2 years ago)

Author:

vondreele

Message:

cleanup of toolbar handling - for mpl 3.3.2 at least. remove unused/commented/dead code.

File:

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

trunk/GSASIIplot.py

@@ -325 +325 @@
         sizer=wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.canvas,1,wx.EXPAND)
-        sizer.Add(self.toolbar,0,wx.LEFT|wx.EXPAND)
+        sizer.Add(self.toolbar,0,)
         self.SetSizer(sizer)
         
@@ -369 +369 @@
         self.figure = mpl.figure.Figure(dpi=dpi,figsize=(6,6))
         self.canvas = Canvas(self,-1,self.figure)
-        self.toolbar = Toolbar(self.canvas)
-        self.toolbar = GSASIItoolbar(self.canvas)
+        self.toolbar = GSASIItoolbar(self.canvas,Arrows=False)
 
         self.toolbar.Realize()
@@ -376 +375 @@
         sizer=wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.canvas,1,wx.EXPAND)
-        sizer.Add(self.toolbar,0,wx.LEFT|wx.EXPAND)
+        sizer.Add(self.toolbar,)
         self.SetSizer(sizer)
                               
@@ -388 +387 @@
         mplv = eval(mpl.__version__.replace('.',','))
         if mplv[0] >= 3 and mplv[1] >= 3:
-            self.toolbar.draw_idle()
+            self.toolbar.canvas.draw_idle()
         else:
             self.toolbar.draw()
+        # mplv = eval(mpl.__version__.replace('.',','))
+        # if mplv[0] >= 3 and mplv[1] >= 3:
+        #     self.toolbar.draw_idle()
+        # else:
+        #     self.toolbar.draw()
         
 class G2PlotNoteBook(wx.Panel):
@@ -638 +642 @@
         self.lastRaisedPlotTab = tabLabel
         if plotDebug: 
-        #    print ('PageChanged, self='+str(self).split('0x')[1]+tabLabel+str(self.skipPageChange))
             print ('PageChanged, self='+str(self).split('0x')[1]+tabLabel)
             print ('event type='+event.GetEventType())
@@ -656 +659 @@
 class GSASIItoolbar(Toolbar):
     'Override the matplotlib toolbar so we can add more icons'
-    def __init__(self,plotCanvas,publish=None):
+    def __init__(self,plotCanvas,publish=None,Arrows=True):
         '''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
-        try:
-            self.toolitems = self.toolitems[:POS_CONFIG_SPLTS_BTN]+self.toolitems[POS_CONFIG_SPLTS_BTN+1:]
-            deleted = True
-        except:
-            deleted = False
+        self.plotCanvas = plotCanvas
         Toolbar.__init__(self,plotCanvas)
-#        G2path = os.path.split(os.path.abspath(__file__))[0]
         self.updateActions = None # defines a call to be made as part of plot updates
-        self.plotCanvas = plotCanvas
-        # 2nd try to remove a button from the bar
-        if not deleted: self.DeleteToolByPos(POS_CONFIG_SPLTS_BTN) #doesn't work in some wxpython versions
+        self.DeleteToolByPos(POS_CONFIG_SPLTS_BTN)
         self.parent = self.GetParent()
         self.AddToolBarTool('Key press','Select key press','key.ico',self.OnKey)
         self.AddToolBarTool('Help on','Show help on this plot','help.ico',self.OnHelp)
         # add arrow keys to control zooming
-        for direc in ('left','right','up','down', 'Expand X','Shrink X','Expand Y','Shrink Y'):
-            if ' ' in direc:
-                sprfx = ''
-                prfx = 'Zoom: '
-            else:
-                sprfx = 'Shift '
-                prfx = 'Shift plot '
-            fil = ''.join([i[0].lower() for i in direc.split()]+['arrow.ico'])
-            self.arrows[direc] = self.AddToolBarTool(sprfx+direc,prfx+direc,fil,self.OnArrow)
-#        G2path = os.path.split(os.path.abspath(__file__))[0]
+        if Arrows:
+            for direc in ('left','right','up','down', 'Expand X','Shrink X','Expand Y','Shrink Y'):
+                if ' ' in direc:
+                    sprfx = ''
+                    prfx = 'Zoom: '
+                else:
+                    sprfx = 'Shift '
+                    prfx = 'Shift plot '
+                fil = ''.join([i[0].lower() for i in direc.split()]+['arrow.ico'])
+                self.arrows[direc] = self.AddToolBarTool(sprfx+direc,prfx+direc,fil,self.OnArrow)
         if publish:
             self.AddToolBarTool('Publish plot','Create publishable version of plot','publish.ico',publish)
@@ -1736 +1732 @@
         print('Possible PickId problem PickId=',G2frame.PickId)
     # for now I am not sure how to regenerate G2frame.HKL
-    G2frame.HKL = [] # TODO
+    G2frame.HKL = []
     PlotPatterns(G2frame,newPlot,plotType)
 
@@ -6213 +6209 @@
         Page.SetToolTipString(Dettext)
 
-#TODO: add histogram positions to polefigures
     if '3D' in SHData['PlotType']:
         new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('Texture','3d')
@@ -6810 +6805 @@
                 Plot.plot(Xnew,Ynew,color=Ncol)
                 Plot.plot(Xnew,Ynew,marker='o',color=Ncol,label=name)
-        if Page.fitvals: # TODO: deal with fitting of None values
+        if Page.fitvals:
             if G2frame.seqReverse and not G2frame.seqXaxis:
                 Page.fitvals = Page.fitvals[::-1]
@@ -8382 +8377 @@
                     Fade += 1
                 Draw('key down',Fade)
-            else:        #TODO sequential result movie here
+            else:
                 SeqId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, 'Sequential results')
                 if SeqId: