Changeset 3899

Timestamp:

Apr 15, 2019 10:54:57 AM (4 years ago)

Author:

toby

Message:

Improve changing plot labels size etc, & Tie zero and diff in multiplot to + mode

File:

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

trunk/GSASIIplot.py

@@ -3075 +3075 @@
                         Plot.set_yscale("log",nonposy='mask')
                         Plot.plot(X,Y,colors[0]+pP,picker=3.,clip_on=Clip_on,label='_obs')
-                        Plot.plot(X,Z,colors[1],picker=False,label='_calc')
-                        Plot.plot(X,W,colors[2],picker=False,label='_bkg')     #background
+                        if G2frame.SinglePlot or G2frame.plusPlot:
+                            Plot.plot(X,Z,colors[1],picker=False,label='_calc')
+                            Plot.plot(X,W,colors[2],picker=False,label='_bkg')     #background
                     elif plottype in ['SASD','REFD']:
                         Plot.set_xscale("log",nonposx='mask')
@@ -3091 +3092 @@
                         Plot.plot(X,W,colors[2],picker=False,label='_bkg')     #const. background
                         Plot.plot(X,ZB,colors[1],picker=False,label='_calc')
-                else:
+                else:  # not logPlot
                     if G2frame.SubBack:
                         if 'PWDR' in plottype:
@@ -3106 +3107 @@
                             Plot.plot(X,YB,colors[0]+pP,picker=3.,clip_on=Clip_on,label='_obs')
                             Plot.plot(X,ZB,colors[1],picker=False,label='_calc')
-                    if 'PWDR' in plottype and G2frame.SinglePlot:
+                    if 'PWDR' in plottype and (G2frame.SinglePlot or G2frame.plusPlot):
                         Plot.plot(X,W,colors[2],picker=False,label='_bkg')                 #Ib
                         if not G2frame.Weight: DifLine = Plot.plot(X,D,colors[3],picker=1.,label='_diff')                 #Io-Ic
@@ -9717 +9718 @@
         '''Apply settings to the plot
         '''
-        Plot.get_xaxis().get_label().set_fontsize(plotOpt['labelSize'])
-        Plot.get_yaxis().get_label().set_fontsize(plotOpt['labelSize'])
-        for l in Plot.get_xaxis().get_ticklabels():
-            l.set_fontsize(plotOpt['labelSize'])
-        for l in Plot.get_yaxis().get_ticklabels():
-            l.set_fontsize(plotOpt['labelSize'])
         Plot.figure.subplots_adjust(left=int(plotOpt['labelSize'])/100.,
-                        bottom=int(plotOpt['labelSize'])/150.,
-                        right=.98,
-                        top=1.-int(plotOpt['labelSize'])/200.,
-                        hspace=0.0)
-        for l in Plot.lines: 
-            l.set_linewidth(plotOpt['lineWid'])
-        Plot.get_xaxis().set_tick_params(width=plotOpt['lineWid'])
-        Plot.get_yaxis().set_tick_params(width=plotOpt['lineWid'])
-        for l in Plot.spines.values():
-            l.set_linewidth(plotOpt['lineWid'])
-        Plot.set_title(plotOpt['title'])
-        Plot.get_xaxis().set_label_text(plotOpt['xtitle'])
-        Plot.get_yaxis().set_label_text(plotOpt['ytitle'])            
+                            bottom=int(plotOpt['labelSize'])/150.,
+                            right=.98,
+                            top=1.-int(plotOpt['labelSize'])/200.,
+                            hspace=0.0)
+        for P in Plot.figure.axes:
+            P.get_xaxis().get_label().set_fontsize(plotOpt['labelSize'])
+            P.get_yaxis().get_label().set_fontsize(plotOpt['labelSize'])
+            for l in P.get_xaxis().get_ticklabels():
+                l.set_fontsize(plotOpt['labelSize'])
+            for l in P.get_yaxis().get_ticklabels():
+                l.set_fontsize(plotOpt['labelSize'])
+            for l in P.lines: 
+                l.set_linewidth(plotOpt['lineWid'])
+            P.get_xaxis().set_tick_params(width=plotOpt['lineWid'])
+            P.get_yaxis().set_tick_params(width=plotOpt['lineWid'])
+            for l in P.spines.values():
+                l.set_linewidth(plotOpt['lineWid'])
+                
+        Plot.set_title(plotOpt['title'],fontsize=plotOpt['labelSize'])
+        for i,P in enumerate(Plot.figure.axes):
+            if not P.get_visible(): continue
+            if i == 0:
+                lbl = ''
+            else:
+                lbl = str(i)
+            P.get_xaxis().set_label_text(plotOpt['xtitle'+lbl])
+            P.get_yaxis().set_label_text(plotOpt['ytitle'+lbl])            
         Plot.figure.canvas.draw()
 
@@ -9768 +9777 @@
     vbox.Add(hbox,0,wx.ALL|wx.EXPAND)
 
-    vbox.Add((1,5))
-    hbox = wx.BoxSizer(wx.HORIZONTAL)
-    hbox.Add(wx.StaticText(dlg,wx.ID_ANY,' x label'),0,wx.ALL)
-    plotOpt['xtitle'] = Plot.get_xaxis().get_label_text()
-    w = G2G.ValidatedTxtCtrl(dlg,plotOpt,'xtitle',OnLeave=RefreshPlot,
+    for i,P in enumerate(Plot.figure.axes):
+        if not P.get_visible(): continue
+        if i == 0:
+            lbl = ''
+        else:
+            lbl = str(i)
+        vbox.Add((1,5))
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+        hbox.Add(wx.StaticText(dlg,wx.ID_ANY,' x label '+lbl),0,wx.ALL)
+        plotOpt['xtitle'+lbl] = P.get_xaxis().get_label_text()
+        w = G2G.ValidatedTxtCtrl(dlg,plotOpt,'xtitle'+lbl,OnLeave=RefreshPlot,
                                  size=(200,-1),notBlank=False)
-    hbox.Add(w,0,wx.ALL|wx.ALIGN_CENTER)
-    vbox.Add(hbox,0,wx.ALL|wx.EXPAND)
+        hbox.Add(w,0,wx.ALL|wx.ALIGN_CENTER)
+        vbox.Add(hbox,0,wx.ALL|wx.EXPAND)
     
-    vbox.Add((1,5))
-    hbox = wx.BoxSizer(wx.HORIZONTAL)
-    hbox.Add(wx.StaticText(dlg,wx.ID_ANY,' y label'),0,wx.ALL)
-    plotOpt['ytitle'] = Plot.get_yaxis().get_label_text()
-    w = G2G.ValidatedTxtCtrl(dlg,plotOpt,'ytitle',OnLeave=RefreshPlot,
+        vbox.Add((1,5))
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+        hbox.Add(wx.StaticText(dlg,wx.ID_ANY,' y label '+lbl),0,wx.ALL)
+        plotOpt['ytitle'+lbl] = P.get_yaxis().get_label_text()
+        w = G2G.ValidatedTxtCtrl(dlg,plotOpt,'ytitle'+lbl,OnLeave=RefreshPlot,
                                  size=(200,-1),notBlank=False)
-    hbox.Add(w,0,wx.ALL|wx.ALIGN_CENTER)
-    vbox.Add(hbox,0,wx.ALL|wx.EXPAND)
+        hbox.Add(w,0,wx.ALL|wx.ALIGN_CENTER)
+        vbox.Add(hbox,0,wx.ALL|wx.EXPAND)
     
     vbox.Add((1,10),1,wx.ALL|wx.EXPAND,1)