Changeset 2455 for trunk/GSASIIplot.py

Timestamp:

Aug 27, 2016 8:30:30 AM (7 years ago)

Author:

vondreele

Message:

implement Clip_on as config parameter with True as default

File:

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

trunk/GSASIIplot.py

@@ -25 +25 @@
 import matplotlib as mpl
 import mpl_toolkits.mplot3d.axes3d as mp3d
-import config as cfg
 import GSASIIpath
+Clip_on = GSASIIpath.GetConfigValue('Clip_on')
 GSASIIpath.SetVersionNumber("$Revision$")
 import GSASIIgrid as G2gd
@@ -1515 +1515 @@
                 backDict['FixedPoints'].append(xy)
                 Plot = Page.figure.gca()
-                Plot.plot(event.xdata,event.ydata,'rD',clip_on=cfg.clip_on,picker=3.)
+                Plot.plot(event.xdata,event.ydata,'rD',clip_on=Clip_on,picker=3.)
                 Page.canvas.draw()
                 return
@@ -1876 +1876 @@
                     if 'PWDR' in plottype:
                         Plot.set_yscale("log",nonposy='mask')
-                        Plot.plot(X,Y,colors[N%6]+pP,picker=3.,clip_on=cfg.clip_on)
+                        Plot.plot(X,Y,colors[N%6]+pP,picker=3.,clip_on=Clip_on)
                         Plot.plot(X,Z,colors[(N+1)%6],picker=False)
                         Plot.plot(X,W,colors[(N+2)%6],picker=False)     #background
@@ -1894 +1894 @@
                                 if G2frame.sqPlot:
                                     Plot.errorbar(X,YB,yerr=X**4*Sample['Scale'][0]*np.sqrt(1./(Pattern[0]['wtFactor']*xye[2])),
-                                        ecolor=colors[N%6],picker=3.,clip_on=cfg.clip_on)
+                                        ecolor=colors[N%6],picker=3.,clip_on=Clip_on)
                                 else:
                                     Plot.errorbar(X,YB,yerr=Sample['Scale'][0]*np.sqrt(1./(Pattern[0]['wtFactor']*xye[2])),
-                                        ecolor=colors[N%6],picker=3.,clip_on=cfg.clip_on)
+                                        ecolor=colors[N%6],picker=3.,clip_on=Clip_on)
                             else:
-                                Plot.plot(X,YB,colors[N%6]+pP,picker=3.,clip_on=cfg.clip_on)
+                                Plot.plot(X,YB,colors[N%6]+pP,picker=3.,clip_on=Clip_on)
                             Plot.plot(X,W,colors[(N+2)%6],picker=False)     #const. background
                             Plot.plot(X,ZB,colors[(N+1)%6],picker=False)
@@ -1907 +1907 @@
                     DZ = xye[3]*np.sqrt(xye[2])
                     DS = xye[5]*np.sqrt(xye[2])-Ymax*Pattern[0]['delOffset']
-                    ObsLine = Plot.plot(X,DY,colors[N%6]+pP,picker=3.,clip_on=cfg.clip_on)         #Io/sig(Io)
+                    ObsLine = Plot.plot(X,DY,colors[N%6]+pP,picker=3.,clip_on=Clip_on)         #Io/sig(Io)
                     Plot.plot(X,DZ,colors[(N+1)%6],picker=False)                    #Ic/sig(Io)
                     DifLine = Plot.plot(X,DS,colors[(N+3)%6],picker=1.)                    #(Io-Ic)/sig(Io)
@@ -1914 +1914 @@
                     if G2frame.SubBack:
                         if 'PWDR' in plottype:
-                            Plot.plot(Xum,Y-W,colors[N%6]+pP,picker=False,clip_on=cfg.clip_on)  #Io-Ib
+                            Plot.plot(Xum,Y-W,colors[N%6]+pP,picker=False,clip_on=Clip_on)  #Io-Ib
                             Plot.plot(X,Z-W,colors[(N+1)%6],picker=False)               #Ic-Ib
                         else:
-                            Plot.plot(X,YB,colors[N%6]+pP,picker=3.,clip_on=cfg.clip_on)
+                            Plot.plot(X,YB,colors[N%6]+pP,picker=3.,clip_on=Clip_on)
                             Plot.plot(X,ZB,colors[(N+1)%6],picker=False)
                     else:
                         if 'PWDR' in plottype:
-                            ObsLine = Plot.plot(Xum,Y,colors[N%6]+pP,picker=3.,clip_on=cfg.clip_on)    #Io
+                            ObsLine = Plot.plot(Xum,Y,colors[N%6]+pP,picker=3.,clip_on=Clip_on)    #Io
                             Plot.plot(X,Z,colors[(N+1)%6],picker=False)                 #Ic
                         else:
-                            Plot.plot(X,YB,colors[N%6]+pP,picker=3.,clip_on=cfg.clip_on)
+                            Plot.plot(X,YB,colors[N%6]+pP,picker=3.,clip_on=Clip_on)
                             Plot.plot(X,ZB,colors[(N+1)%6],picker=False)
                     if 'PWDR' in plottype:
@@ -2044 +2044 @@
                 else:
                     break
-            Plot.plot(x,y,'rD',clip_on=cfg.clip_on,picker=3.)
+            Plot.plot(x,y,'rD',clip_on=Clip_on,picker=3.)
     if not newPlot:
         # this restores previous plot limits (but I'm not sure why there are two .push_current calls)