Changeset 5370 for trunk/GSASIIplot.py

Timestamp:

Nov 12, 2022 4:36:04 PM (7 months ago)

Author:

toby

Message:

fix validatedTextCtrl; add sliders for contour thresholds

File:

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

trunk/GSASIIplot.py

@@ -2107 +2107 @@
                 Page.plotStyle['logPlot'] = False
                 G2frame.SubBack = False
-            Ymax = max(Pattern[1][1])
+            YmaxS = max(Pattern[1][1])
             if Page.plotStyle['sqrtPlot']:
-                Page.plotStyle['delOffset'] = .02*np.sqrt(Ymax)
-                Page.plotStyle['refOffset'] = -0.1*np.sqrt(Ymax)
-                Page.plotStyle['refDelt'] = .1*np.sqrt(Ymax)
+                Page.plotStyle['delOffset'] = .02*np.sqrt(YmaxS)
+                Page.plotStyle['refOffset'] = -0.1*np.sqrt(YmaxS)
+                Page.plotStyle['refDelt'] = .1*np.sqrt(YmaxS)
             else:
-                Page.plotStyle['delOffset'] = .02*Ymax
-                Page.plotStyle['refOffset'] = -0.1*Ymax
-                Page.plotStyle['refDelt'] = .1*Ymax
+                Page.plotStyle['delOffset'] = .02*YmaxS
+                Page.plotStyle['refOffset'] = -0.1*YmaxS
+                Page.plotStyle['refDelt'] = .1*YmaxS
             newPlot = True
         elif event.key == 'S' and 'PWDR' in plottype:
@@ -2162 +2162 @@
                 G2frame.Cmin = 0.0
                 Page.plotStyle['Offset'] = [0,0]
+        elif event.key == 'C' and 'PWDR' in plottype and G2frame.Contour:
+            G2G.makeContourSliders(G2frame,Ymax,PlotPatterns,newPlot,plotType)
         elif event.key == 'c' and 'PWDR' in plottype:
             newPlot = True
@@ -3209 +3211 @@
             'D: lower contour min','U: raise contour min',
             'o: reset contour limits','g: toggle grid',
-            'i: interpolation method','S: color scheme','c: contour off','t: temperature for y-axis','s: toggle sqrt plot')
+            'i: interpolation method','S: color scheme','c: contour off',
+            't: temperature for y-axis','s: toggle sqrt plot',
+            'C: contour plot control window'
+            )
     else:
         if 'PWDR' in plottype: