Changeset 2209 for trunk/GSASIIplot.py

Timestamp:

Apr 12, 2016 3:46:54 PM (7 years ago)

Author:

vondreele

Message:

Add symmetry (inversion thru ccenter!) to transition probability matrix
Add u,d,l,r shifts of multi XY2 patterns in PlotXY

File:

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

trunk/GSASIIplot.py

@@ -2471 +2471 @@
     '''simple plot of xy data, used for diagnostic purposes
     '''
+    def OnKeyPress(event):
+        if event.key == 'u':
+            if Page.Offset[1] < 100.:
+                Page.Offset[1] += 1.
+        elif event.key == 'd':
+            if Page.Offset[1] > 0.:
+                Page.Offset[1] -= 1.
+        elif event.key == 'l':
+            Page.Offset[0] -= 1.
+        elif event.key == 'r':
+            Page.Offset[0] += 1.
+        elif event.key == 'o':
+            Page.Offset = [0,0]
+        else:
+#            print 'no binding for key',event.key
+            #GSASIIpath.IPyBreak()
+            return
+        wx.CallAfter(PlotXY,G2frame,XY,XY2,labelX,labelY,False,Title,False)
+
     def OnMotion(event):
         xpos = event.xdata
@@ -2495 +2514 @@
         plotNum = G2frame.G2plotNB.plotList.index(Title)
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
+        Page.canvas.mpl_connect('key_press_event', OnKeyPress)
         Page.canvas.mpl_connect('motion_notify_event', OnMotion)
+        Page.Offset = [0,0]
     
-    Page.Choice = None
+    if len(XY2) > 1:
+        Page.Choice = (' key press','l: offset left','r: offset right','d: offset down',
+            'u: offset up','o: reset offset',)
+    else:
+        Page.Choice = None
     G2frame.G2plotNB.RaisePageNoRefresh(Page)
     G2frame.G2plotNB.status.DestroyChildren()
@@ -2510 +2535 @@
         Plot.set_ylabel(r'Y',fontsize=14)
     colors=['b','g','r','c','m','k']
+    Page.keyPress = OnKeyPress
+    Xmax = 0.
+    Ymax = 0.    
     for ixy,xy in enumerate(XY):
         X,Y = XY[ixy]
+        Xmax = max(Xmax,max(X))
+        Ymax = max(Ymax,max(Y))
         if lines:
             Plot.plot(X,Y,colors[ixy%6],picker=False)
@@ -2519 +2549 @@
         for ixy,xy in enumerate(XY2):
             X,Y = XY2[ixy]
-            Plot.plot(X,Y,colors[ixy%6],picker=False)
+            dX = Page.Offset[0]*(ixy+1)*Xmax/500.
+            dY = Page.Offset[1]*(ixy+1)*Ymax/100.
+            Plot.plot(X+dX,Y+dY,colors[ixy%6],picker=False)
     if not newPlot:
         Page.toolbar.push_current()
@@ -6008 +6040 @@
             if il:
                 TX += np.array(Trans[laySeq[il-1]][laySeq[il]][1:4])
+#                TX[0] %= 1.
+#                TX[1] %= 1.
                 XYZ += TX
             AtNames += atNames
@@ -6354 +6388 @@
     Page.camera['backColor'] = np.array([0,0,0,0])
     Page.canvas.SetCurrent()
-    Draw('main')
+    wx.CallAfter(Draw,'main')