Changeset 3798 for trunk

Timestamp:

Jan 25, 2019 2:34:25 PM (6 years ago)

Author:

vondreele

Message:

add toggle for grid lines for most plots

File:

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

trunk/GSASIIplot.py ¶

@@ -1233 +1233 @@
         Page.Offset = [0,0]
     
-    Page.Choice = (' key press','f: toggle Fhkl/F^2hkl plot','q: toggle q/d plot')
+    Page.Choice = (' key press','g: toggle grid','f: toggle Fhkl/F^2hkl plot','q: toggle q/d plot')
     Draw()
     
@@ -1883 +1883 @@
             elif Page.plotStyle['Offset'][0] > -100.:
                 Page.plotStyle['Offset'][0] -= 10.
+        elif event.key == 'g':
+            mpl.rcParams['axes.grid'] = not mpl.rcParams['axes.grid']
         elif event.key == 'l' and not G2frame.SinglePlot:
             Page.plotStyle['Offset'][1] -= 1.
@@ -2559 +2561 @@
     DifLine = ['']
     if G2frame.Contour:
-        Page.Choice = (' key press','d: lower contour max','u: raise contour max','o: reset contour max',
+        Page.Choice = (' key press','d: lower contour max','u: raise contour max','o: reset contour max','g: toggle grid',
             'i: interpolation method','s: color scheme','c: contour off','t: temperature for y-axis')
     else:
@@ -2565 +2567 @@
             if 'PWDR' in plottype:
                 if G2frame.SinglePlot:
-                    Page.Choice = (' key press','n: log(I) off',
+                    Page.Choice = (' key press','n: log(I) off','g: toggle grid',
                         'c: contour on','q: toggle q plot','t: toggle d-spacing plot',
                             'm: toggle multidata plot','+: toggle selection')
                 else:
-                    Page.Choice = (' key press','n: log(I) off',
+                    Page.Choice = (' key press','n: log(I) off','g: toggle grid',
                         'd: offset down','l: offset left','r: offset right','u: offset up','o: reset offset',
                         'c: contour on','q: toggle q plot','t: toggle d-spacing plot','f: select data',
@@ -2575 +2577 @@
             elif plottype in ['SASD','REFD']:
                 if G2frame.SinglePlot:
-                    Page.Choice = (' key press','b: toggle subtract background file','n: semilog on',
+                    Page.Choice = (' key press','b: toggle subtract background file','n: semilog on','g: toggle grid',
                         'q: toggle S(q) plot','m: toggle multidata plot','w: toggle (Io-Ic)/sig plot','+: toggle selection')
                 else:
-                    Page.Choice = (' key press','b: toggle subtract background file','n: semilog on',
+                    Page.Choice = (' key press','b: toggle subtract background file','n: semilog on','g: toggle grid',
                         'd: offset down','l: offset left','r: offset right','u: offset up','o: reset offset',
                         'q: toggle S(q) plot','m: toggle multidata plot','w: toggle (Io-Ic)/sig plot','+: toggle selection')
@@ -2586 +2588 @@
                     Page.Choice = (' key press',
                         'b: toggle subtract background','n: log(I) on','s: toggle sqrt plot','c: contour on',
-                        'q: toggle q plot','t: toggle d-spacing plot','m: toggle multidata plot',
+                        'q: toggle q plot','t: toggle d-spacing plot','m: toggle multidata plot','g: toggle grid',
                         'w: toggle (Io-Ic)/sig plot','+: no selection')
                 else:
                     Page.Choice = (' key press','l: offset left','r: offset right','d/D: offset down/10x','u/U: offset up/10x','o: reset offset',
-                        'b: toggle subtract background','n: log(I) on','c: contour on','q: toggle q plot','t: toggle d-spacing plot',
+                        'b: toggle subtract background','n: log(I) on','c: contour on','q: toggle q plot','t: toggle d-spacing plot','g: toggle grid',
                         'm: toggle multidata plot','w: toggle (Io-Ic)/sig plot','f: select data','s: color scheme','+: no selection')
             elif plottype in ['SASD','REFD']:
                 if G2frame.SinglePlot:
-                    Page.Choice = (' key press','b: toggle subtract background file','n: loglog on','e: toggle error bars',
+                    Page.Choice = (' key press','b: toggle subtract background file','n: loglog on','e: toggle error bars','g: toggle grid',
                         'q: toggle S(q) plot','m: toggle multidata plot','w: toggle (Io-Ic)/sig plot','+: no selection')
                 else:
-                    Page.Choice = (' key press','b: toggle subtract background file','n: loglog on','e: toggle error bars',
+                    Page.Choice = (' key press','b: toggle subtract background file','n: loglog on','e: toggle error bars','g: toggle grid',
                         'd: offset down','l: offset left','r: offset right','u: offset up','o: reset offset',
                         'q: toggle S(q) plot','m: toggle multidata plot','w: toggle (Io-Ic)/sig plot','+: no selection')
@@ -4193 +4195 @@
         elif event.key == 't' and not G2frame.Contour:
             G2frame.Legend = not G2frame.Legend
+        elif event.key == 'g':
+            mpl.rcParams['axes.grid'] = not mpl.rcParams['axes.grid']
         PlotISFG(G2frame,data,newPlot=newPlot,plotType=plotType)
         
@@ -4295 +4299 @@
         if G2frame.Contour:
             Page.Choice = (' key press','d: lower contour max','u: raise contour max',
-                'D: lower contour min','U: raise contour min','o: reset to default',
+                'D: lower contour min','U: raise contour min','o: reset to default','g: toggle grid',
                 'i: interpolation method','s: color scheme','c: contour off','f: select data',
                 )
         else:
             Page.Choice = (' key press','l: offset left','r: offset right','d/D: offset down/10x','u/U: offset up/10x',
-                'o: reset offset','t: toggle legend','c: contour on','w: toggle waterfall colors (slow!)',
+                'o: reset offset','t: toggle legend','c: contour on','g: toggle grid','w: toggle waterfall colors (slow!)',
                 'm: toggle multiplot','s: color scheme','f: select data' )
         Page.keyPress = OnPlotKeyPress
@@ -4605 +4609 @@
             if len(XY2):
                 G2IO.XYsave(G2frame,XY2,labelX,labelY,names2)
-#        else:
-#            return
+        elif event.key == 'g':
+            mpl.rcParams['axes.grid'] = not mpl.rcParams['axes.grid']
         Draw()
 
@@ -4682 +4686 @@
     if lines:
         Page.Choice = (' key press','l: offset left','r: offset right','d: offset down',
-            'u: offset up','o: reset offset','s: save data as csv file')
+            'u: offset up','o: reset offset','g: toggle grid','s: save data as csv file')
     else:
         Page.Choice = None
@@ -4715 +4719 @@
             G2frame.Cmax = 1.0
             
+        elif event.key == 'g':
+            mpl.rcParams['axes.grid'] = not mpl.rcParams['axes.grid']
+
         elif event.key == 'i':
             choice = ['nearest','bilinear','bicubic','spline16','spline36','hanning',
@@ -4773 +4780 @@
     
     Page.Choice = (' key press','d: lower contour max','u: raise contour max','o: reset contour max',
-        'i: interpolation method','s: color scheme')
+        'g: toggle grid','i: interpolation method','s: color scheme')
     Page.keyPress = OnKeyPress
     Page.SetFocus()