Changeset 2835 for trunk/GSASIIplot.py

Timestamp:

May 16, 2017 4:02:31 PM (6 years ago)

Author:

vondreele

Message:

add self.scriptable=False to ImportBaseClass?
set it True in various PWDR readers
when selecting points for image calibration, shift key forces selection at cursor
Status bar text changes to reflect this

File:

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

trunk/GSASIIplot.py

@@ -4489 +4489 @@
                 ypix = int(ypos*scaley)
                 Int = 0
-                if (0 <= xpix < sizexy[1]) and (0 <= ypix < sizexy[0]):
+                if (0 <= xpix < sizexy[0]) and (0 <= ypix < sizexy[1]):
                     Int = G2frame.ImageZ[ypix][xpix]
                 tth,azm,D,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
@@ -4571 +4571 @@
             elif event.key in ['y',]:
                 Data['invert_y'] = not Data['invert_y']
+            else:
+                return
             wx.CallAfter(PlotImage,G2frame,newPlot=True)
             
@@ -4838 +4840 @@
                     Xpix = Xpos*scalex
                     Ypix = Ypos*scaley
-                    xpos,ypos,I,J = G2img.ImageLocalMax(G2frame.ImageZ,pixLimit,Xpix,Ypix)
+                    if event.key == 'shift':                #force selection at cursor position
+                        xpos = Xpix
+                        ypos = Ypix
+                        I = J = 10
+                    else:
+                        xpos,ypos,I,J = G2img.ImageLocalMax(G2frame.ImageZ,pixLimit,Xpix,Ypix)
                     if I and J:
                         xpos += .5                              #shift to pixel center