Changeset 4552

Timestamp:

Aug 21, 2020 7:41:12 AM (3 years ago)

Author:

vondreele

Message:

reinstate wx.CallAfter? for ReloadFromGPX - needed to get reload to work properly
do AddToNotebook? inside reloadFromGPX after the load
Fix mpl 3.3 bugs

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -5046 +5046 @@
                 if dlg2.ShowModal() == wx.ID_OK:
                     if refPlotUpdate: refPlotUpdate({},restore=True)
-                    self.reloadFromGPX
+                    wx.CallAfter(self.reloadFromGPX,rtext)
                 else:
                     if refPlotUpdate: refPlotUpdate({},restore=True)
-                self.AddToNotebook(rtext)
             finally:
                 dlg2.Destroy()
@@ -5055 +5054 @@
             self.ErrorDialog('Refinement error',Msg)
             
-    def reloadFromGPX(self):
+    def reloadFromGPX(self,rtext=None):
         '''Deletes current data tree & reloads it from GPX file (after a 
         refinemnt.) Done after events are completed to avoid crashes.
+        :param rtext str: string info from cller to be put in Notebook after reload
         '''
         self.GPXtree.DeleteChildren(self.root)
@@ -5064 +5064 @@
         self.TreeItemDelete = False  # tree has been repopulated; ignore previous deletions
         self.GPXtree.RestoreExposedItems() # reset exposed/hidden tree items
+        if rtext is not None:
+            self.AddToNotebook(rtext)
         self.ResetPlots()        
         

trunk/GSASIIplot.py

@@ -209 +209 @@
 timeDebug = GSASIIpath.GetConfigValue('Show_timing',False)
 obsInCaption = True # include the observed, calc,... items in the plot caption (PlotPatterns)
+mplv = eval(mpl.__version__.replace('.',','))
 
 #matplotlib 2.0.x dumbed down Paired to 16 colors - 
@@ -332 +333 @@
         
     def ToolBarDraw(self):
-        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()
@@ -10565 +10565 @@
     legend.delay = delay*1000 # Hold time in ms for clear; 0 == forever
     for line in legend.get_lines():
-        line.set_picker(4)
+        if mplv[0] >= 3 and mplv[1] >= 3:
+            line.set_pickradius(4)
+        else:
+            line.set_picker(4)
         # bug: legend items with single markers don't seem to respond to a "pick"
     #GSASIIpath.IPyBreak()
     for txt in legend.get_texts():
-        txt.set_picker(4)
+        if mplv[0] >= 3 and mplv[1] >= 3:
+            txt.set_pickradius(4)
+        else:
+            txt.set_picker(4)
     if new:
         legend.figure.canvas.mpl_connect('pick_event',onLegendPick)