Changeset 2654 for trunk/GSASIIplot.py

Timestamp:

Jan 22, 2017 2:28:44 PM (6 years ago)

Author:

toby

Message:

improve ComputeAllPDF progress msg; PDF contour plot: change G(r)_min

File:

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

trunk/GSASIIplot.py

@@ -2293 +2293 @@
     new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('Error analysis','mpl')
     if new:
+        G2frame.Cmin = 0.0
         G2frame.Cmax = 1.0
     # save information needed to reload from tree and redraw
@@ -2352 +2353 @@
     or multiple plots with waterfall and contour plots as options
     '''
+    G2frame.ShiftDown = False
     if not plotType:
         plotType = G2frame.G2plotNB.plotList[G2frame.G2plotNB.nb.GetSelection()]
@@ -2357 +2359 @@
         return
     
+    def OnPlotKeyUp(event):    
+        if event.key == 'shift':
+            G2frame.ShiftDown = False
+            return
+        
     def OnPlotKeyPress(event):
+        if event.key == 'shift':
+            G2frame.ShiftDown = True
+            return
         newPlot = False
+        if G2frame.ShiftDown: event.key = event.key.upper()
         if event.key == 'u':
             if G2frame.Contour:
@@ -2369 +2380 @@
             elif Page.Offset[1] > 0.:
                 Page.Offset[1] -= 1.
+        elif event.key == 'U':
+            G2frame.Cmin += (G2frame.Cmax - G2frame.Cmin)/20.
+        elif event.key == 'D':
+            G2frame.Cmin -= (G2frame.Cmax - G2frame.Cmin)/20.
         elif event.key == 'l':
             Page.Offset[0] -= 1.
@@ -2443 +2458 @@
     else:
         newPlot = True
+        G2frame.Cmin = 0.0
         G2frame.Cmax = 1.0
         Page.canvas.mpl_connect('key_press_event', OnPlotKeyPress)
+        Page.canvas.mpl_connect('key_release_event', OnPlotKeyUp)
         Page.canvas.mpl_connect('motion_notify_event', OnMotion)
         Page.Offset = [0,0]
@@ -2451 +2468 @@
     if G2frame.Contour:
         Page.Choice = (' key press','d: lower contour max','u: raise contour max',
-            'i: interpolation method','s: color scheme','c: contour off','f: select data')
+            'D: lower contour min','U: raise contour min',
+            'i: interpolation method','s: color scheme','c: contour off','f: select data',
+            )
     else:
         Page.Choice = (' key press','l: offset left','r: offset right','d: offset down','u: offset up',
@@ -2530 +2549 @@
     if G2frame.Contour and len(Pattern)>1:
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
-        Img = Plot.imshow(ContourZ,cmap=acolor,vmin=0,vmax=Ymax*G2frame.Cmax,interpolation=G2frame.Interpolate, 
+        Img = Plot.imshow(ContourZ,cmap=acolor,vmin=Ymax*G2frame.Cmin,vmax=Ymax*G2frame.Cmax,interpolation=G2frame.Interpolate, 
             extent=[ContourX[0],ContourX[-1],ContourY[0],ContourY[-1]],aspect='auto',origin='lower')
         Page.figure.colorbar(Img)