Changeset 1463

Timestamp:

Aug 15, 2014 6:17:31 PM (8 years ago)

Author:

vondreele

Message:

fix motion position in q & d plots

File:

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

trunk/GSASIIplot.py

@@ -948 +948 @@
                 if 'C' in Parms['Type'][0]:
                     wave = G2mth.getWave(Parms)
-                    if (G2frame.qPlot or G2frame.dPlot) and 'PWDR' in plottype:
+                    if G2frame.qPlot and 'PWDR' in plottype:
                         try:
                             xpos = 2.0*asind(xpos*wave/(4*math.pi))
                         except ValueError:      #avoid bad value in asin beyond upper limit
                             pass
+                    elif G2frame.dPlot:
+                        dsp = xpos
+                        q = 2.*np.pi/dsp
+                        xpos = 2.0*asind(wave/(2.*dsp))
                     dsp = 0.0
                     if abs(xpos) > 0.:                  #avoid possible singularity at beam center
@@ -977 +981 @@
                     dsp = 0.0
                     difC = Parms['difC'][1]
-                    dsp = xpos/difC             #rough approx.!
+                    if G2frame.dPlot:
+                        dsp = xpos
+                        xpos = difC*dsp
+                    elif G2frame.qPlot and 'PWDR' in plottype:
+                        dsp = 2.*np.pi/xpos
+                        xpos = difC*dsp
+                    else:
+                        dsp = xpos/difC             #rough approx.!
                     q = 2.*np.pi/dsp
                     if G2frame.Contour:
@@ -1095 +1106 @@
     def OnRelease(event):
         if G2frame.itemPicked is None: return
-        if DifLine[0] and DifLine[0].get_label() in str(G2frame.itemPicked):
+        if str(DifLine[0]) == str(G2frame.itemPicked):
             ypos = event.ydata
             G2frame.delOffset = -ypos/Ymax