Changeset 3349

Timestamp:

Apr 17, 2018 7:39:42 PM (5 years ago)

Author:

toby

Message:

allow publication plot to work with older MPL versions

File:

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

trunk/GSASIIplot.py

@@ -3056 +3056 @@
         '''
         hcfigure = mpl.figure.Figure(dpi=plotOpt['dpi'],figsize=(plotOpt['width'],plotOpt['height']))
-#        hccanvas = hcCanvas(hcfigure)
         CopyRietveldPlot(G2frame,Pattern,Plot,Page,hcfigure)
         longFormatName,typ = plotOpt['format'].split(',')
@@ -3064 +3063 @@
             dlg.EndModal(wx.ID_OK)
         elif fil:
+            if hcfigure.canvas is None:
+                if GSASIIpath.GetConfigValue('debug'): print('creating canvas')
+                hccanvas = hcCanvas(hcfigure)
             hcfigure.savefig(fil,format=typ.strip())
             dlg.EndModal(wx.ID_OK)
@@ -3254 +3256 @@
             mew = l.get_mew()
             if lbl[1:] == 'obs':
-                siz = plotOpt['markerSiz']
+                siz = float(plotOpt['markerSiz'])
                 marker = plotOpt['markerSym']
-                mew = plotOpt['markerWid']
+                mew = float(plotOpt['markerWid'])
             else:
-                lineWid = plotOpt['lineWid']
+                lineWid = float(plotOpt['lineWid'])
             c = plotOpt['colors'].get(lbl[1:],l.get_color())
             if sum(c) == 4.0: continue
@@ -3275 +3277 @@
             c = plotOpt['colors'].get(lbl,l.get_color())
             #siz = l.get_markersize()
-            siz = plotOpt['tickSiz']
+            siz = float(plotOpt['tickSiz'])
             #mew = l.get_mew()
-            mew = plotOpt['tickWid']
+            mew = float(plotOpt['tickWid'])
             if sum(c) == 4.0: continue
             if not plotOpt['legend'].get(lbl):
@@ -3296 +3298 @@
                     verticalalignment='bottom',
                     horizontalalignment=l.get_horizontalalignment(),
-                    fontsize=plotOpt['labelSize'])
+                    fontsize=float(plotOpt['labelSize']))
     rsig = np.sqrt(Pattern[1][2])
     rsig[rsig>1] = 1