Changeset 5471

Timestamp:

Jan 11, 2023 8:56:33 PM (11 months ago)

Author:

toby

Message:

attempted fix: mpl does not always import .figure

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (9 diffs)
• GSASIItestplot.py (modified) (2 diffs)

trunk/GSASIIctrlGUI.py

@@ -151 +151 @@
     import wx.lib.filebrowsebutton as wxfilebrowse
     import matplotlib as mpl
+    import matplotlib.figure as mplfig
 
 except ImportError:
@@ -6777 +6778 @@
         hSizer.Add(vSizer,1,wx.EXPAND,1)
         pltPanel = wx.Panel(self,size=(-1,-1))
-        self.figure = mpl.figure.Figure(dpi=100,figsize=(3,2))
+        self.figure = mplfig.Figure(dpi=100,figsize=(3,2))
         self.figure.subplots_adjust(right=0.99,top=0.99)
         Canvas(pltPanel, wx.ID_ANY, self.figure) # no need to save, get this from self.figure.canvas

trunk/GSASIIdataGUI.py

@@ -451 +451 @@
                     warn = True
                     break
-        if s in versionDict['tooNewWarn'] and not warn:
-            match = compareVersions(pkgver,versionDict['tooNewWarn'][s])
-            if match >= 0:
-                msg += "Problems are anticipated with this version (not tested)"
-                warn = True
         if s in versionDict['tooNewUntested'] and not warn:
             match = compareVersions(pkgver,versionDict['tooNewUntested'][s])
@@ -461 +456 @@
                 msg += "New version not tested; please keep us posted"
                 warn = True
+        if s in versionDict['tooNewWarn'] and not warn:
+            match = compareVersions(pkgver,versionDict['tooNewWarn'][s])
+            if match >= 0:
+                msg += "Tests incomplete w/suspected bugs; Please report problems"
         print("  {:12s}{}  {}".format(s+':',pkgver,msg))
 

trunk/GSASIIplot.py

@@ -126 +126 @@
     import wx.aui
     import wx.glcanvas
+except (ImportError, ValueError):
+    print('GSASIIplot: wx not imported')
+try:
     import matplotlib as mpl
     if not mpl.get_backend():       #could be assigned by spyder debugger
         mpl.use('wxAgg')
+    import matplotlib.figure as mplfig
     import matplotlib.collections as mplC
     import mpl_toolkits.mplot3d.axes3d as mp3d
     from scipy.ndimage.interpolation import map_coordinates
-except (ImportError, ValueError):
-    pass
+except (ImportError, ValueError) as err:
+    print('GSASIIplot: matplotlib not imported')
+    if GSASIIpath.GetConfigValue('debug'): print('error msg:',err)
+
 import GSASIIpath
 Clip_on = GSASIIpath.GetConfigValue('Clip_on',True)
@@ -316 +322 @@
         mpl.rcParams['legend.fontsize'] = 10
         mpl.rcParams['axes.grid'] = False
-        self.figure = mpl.figure.Figure(dpi=dpi,figsize=(5,6))
+        self.figure = mplfig.Figure(dpi=dpi,figsize=(5,6))
         self.canvas = Canvas(self,-1,self.figure)
         self.toolbar = GSASIItoolbar(self.canvas,publish=publish)
@@ -373 +379 @@
     def __init__(self,parent,id=-1,dpi=None,**kwargs):
         _tabPlotWin.__init__(self,parent,id=id,**kwargs)
-        self.figure = mpl.figure.Figure(dpi=dpi,figsize=(6,6))
+        self.figure = mplfig.Figure(dpi=dpi,figsize=(6,6))
         self.canvas = Canvas(self,-1,self.figure)
         self.toolbar = GSASIItoolbar(self.canvas,Arrows=False)
@@ -3999 +4005 @@
         plotOpt['initNeeded'] = False
         # create a temporary hard-copy figure to get output options
-        figure = mpl.figure.Figure(dpi=200,figsize=(6,8))
+        figure = mplfig.Figure(dpi=200,figsize=(6,8))
         canvas = hcCanvas(figure)
         fmtDict = canvas.get_supported_filetypes()
@@ -4837 +4843 @@
         '''Write the current plot to a file
         '''
-        hcfigure = mpl.figure.Figure(dpi=plotOpt['dpi'],figsize=(plotOpt['width'],plotOpt['height']))
+        hcfigure = mplfig.Figure(dpi=plotOpt['dpi'],figsize=(plotOpt['width'],plotOpt['height']))
         CopyRietveldPlot(G2frame,Pattern,Plot,Page,hcfigure)
         if 'OriginPro' in plotOpt['format']:
@@ -5000 +5006 @@
 
     # screen preview
-    figure = mpl.figure.Figure(figsize=(plotOpt['width'],plotOpt['height']))
+    figure = mplfig.Figure(figsize=(plotOpt['width'],plotOpt['height']))
     canvas = Canvas(dlg,-1,figure)
     vbox.Add(canvas,1,wx.ALL|wx.EXPAND,1)
@@ -5036 +5042 @@
     :param mpl.axes Plot: The axes object from the Rietveld plot
     :param wx.Panel Page: The tabbed panel for the Rietveld plot
-    :param mpl.figure figure: The figure object from the Rietveld plot
+    :param matplotlib.figure.Figure figure: The figure object from the Rietveld plot
     '''
     gs = mpl.gridspec.GridSpec(2, 1, height_ratios=[4, 1])
@@ -10030 +10036 @@
         color wx.Colour object - doesn't work
         '''                     
-        figure = mpl.figure.Figure(figsize=(1.,1.),facecolor=(0.,0.,0.,0.))
+        figure = mplfig.Figure(figsize=(1.,1.),facecolor=(0.,0.,0.,0.))
         figure.clf()
         canvas = hcCanvas(figure)
@@ -10501 +10507 @@
             Z = np.where(Zslice<=Rmax,Zslice,Rmax)
             ZU = np.flipud(Z)
-            figure = mpl.figure.Figure(figsize=(6,6),facecolor=(1.,1.,1.,.5))
+            figure = mplfig.Figure(figsize=(6,6),facecolor=(1.,1.,1.,.5))
             canvas = hcCanvas(figure)
             figure.clf()

trunk/GSASIItestplot.py

@@ -10 +10 @@
 import wx.aui
 import matplotlib as mpl
+import matplotlib.figure as mplfig
 try:
     from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
@@ -23 +24 @@
     def __init__(self, parent, id = -1, dpi = None, **kwargs):
         wx.Panel.__init__(self, parent, id=id, **kwargs)
-        self.figure = mpl.figure.Figure(dpi=dpi, #figsize=(5,7)
+        self.figure = mplfig.Figure(dpi=dpi, #figsize=(5,7)
                                         )
         self.canvas = Canvas(self, -1, self.figure)