Changeset 3138

Timestamp:

Oct 24, 2017 2:15:48 PM (6 years ago)

Author:

vondreele

Message:

in 'M' waterfall plots, allow u/U & d/D where upper case is 10x shift. Also allow <0 vertical offsets.

File:

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

trunk/GSASIIplot.py

@@ -1380 +1380 @@
             if G2frame.Contour:
                 G2frame.Cmax = max(0.0,G2frame.Cmax*0.8)
-            elif Pattern[0]['Offset'][0] > 0.:
+            elif Pattern[0]['Offset'][0] > -100.:
                 Pattern[0]['Offset'][0] -= 1.
+        elif event.key == 'U':
+            if G2frame.Contour:
+                G2frame.Cmin += (G2frame.Cmax - G2frame.Cmin)/5.
+            elif Pattern[0]['Offset'][0] < 100.:
+               Pattern[0]['Offset'][0] += 10.
+        elif event.key == 'D':
+            if G2frame.Contour:
+                G2frame.Cmin -= (G2frame.Cmax - G2frame.Cmin)/5.
+            elif Pattern[0]['Offset'][0] > -100.:
+                Pattern[0]['Offset'][0] -= 10.
         elif event.key == 'l' and not G2frame.SinglePlot:
             Pattern[0]['Offset'][1] -= 1.
@@ -1983 +1993 @@
                         'w: toggle divide by sig','+: no selection')
                 else:
-                    Page.Choice = (' key press','l: offset left','r: offset right','d: offset down','u: offset up','o: reset offset',
+                    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',
                         'm: toggle multidata plot','f: select data','s: color scheme','w: toggle divide by sig','+: no selection')
@@ -2521 +2531 @@
             if G2frame.Contour:
                 G2frame.Cmax = max(0.0,G2frame.Cmax*0.8)
-            elif Page.Offset[1] > 0.:
+            elif Page.Offset[1] > -100.:
                 Page.Offset[1] -= 1.
         elif event.key == 'U':
-            G2frame.Cmin += (G2frame.Cmax - G2frame.Cmin)/20.
+            if G2frame.Contour:
+                G2frame.Cmin += (G2frame.Cmax - G2frame.Cmin)/5.
+            elif Page.Offset[1] < 100.:
+               Page.Offset[1] += 10.
         elif event.key == 'D':
-            G2frame.Cmin -= (G2frame.Cmax - G2frame.Cmin)/20.
+            if G2frame.Contour:
+                G2frame.Cmin -= (G2frame.Cmax - G2frame.Cmin)/5.
+            elif Page.Offset[1] > -100.:
+                Page.Offset[1] -= 10.
         elif event.key == 'l':
             Page.Offset[0] -= 1.
@@ -2692 +2708 @@
                 )
         else:
-            Page.Choice = (' key press','l: offset left','r: offset right','d: offset down','u: offset up',
+            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!)',
                 'm: toggle multiplot','s: color scheme','f: select data' )