Changeset 3652

Timestamp:

Oct 5, 2018 3:47:53 PM (5 years ago)

Author:

toby

Message:

add keys to cycle through magnetic cells

Location:

trunk

Files:

• GSASIIplot.py (modified) (13 diffs)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIplot.py

@@ -1584 +1584 @@
     PlotPatterns(G2frame,newPlot,plotType)
 
-def PlotPatterns(G2frame,newPlot=False,plotType='PWDR',data=None):
+def PlotPatterns(G2frame,newPlot=False,plotType='PWDR',data=None,
+                     extraKeys=[]):
     '''Powder pattern plotting package - displays single or multiple powder patterns as intensity vs
     2-theta, q or TOF. Can display multiple patterns as "waterfall plots" or contour plots. Log I 
@@ -1804 +1805 @@
                 G2frame.Interpolate = 'nearest'
             dlg.Destroy()
+        elif event.key in [KeyItem[0] for KeyItem in extraKeys]:
+            for KeyItem in extraKeys:
+                if event.key == KeyItem[0]:
+                    KeyItem[1]()
+                    break
         else:
-#            print 'no binding for key',event.key
+            print('no binding for key',event.key)
             #GSASIIpath.IPyBreak()
             return
-        wx.CallAfter(PlotPatterns,G2frame,newPlot=newPlot,plotType=plottype)
+        wx.CallAfter(PlotPatterns,G2frame,newPlot=newPlot,plotType=plottype,extraKeys=extraKeys)
         
     def OnMotion(event):
@@ -2051 +2057 @@
                 data['sigDict'] = {}    #now invalid
                 G2pdG.UpdatePeakGrid(G2frame,data)
-                PlotPatterns(G2frame,plotType=plottype)
+                PlotPatterns(G2frame,plotType=plottype,extraKeys=extraKeys)
             else:                                                   #picked a peak list line
                 # prepare to animate move of line
@@ -2083 +2089 @@
                 G2frame.GPXtree.SetItemPyData(LimitId,data)
                 G2pdG.UpdateLimitsGrid(G2frame,data,plottype)
-                wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+                wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             else:                                                   #picked a limit line
                 # prepare to animate move of line
@@ -2104 +2110 @@
                     data[1][1] = max(xy[0],data[1][0])
                 G2frame.GPXtree.SetItemPyData(LimitId,data)
-                wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+                wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             else:                                                   #picked a limit line
                 G2frame.itemPicked = pick
@@ -2168 +2174 @@
                 elif mode == 'Del':
                     del backDict['FixedPoints'][G2frame.fixPtMarker]
-                    wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+                    wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
                 return
                 
@@ -2183 +2189 @@
             G2frame.cid = None
         if event.xdata is None or event.ydata is None: # ignore drag if cursor is outside of plot
-            wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+            wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             return
         if not G2frame.PickId:
@@ -2192 +2198 @@
             if Page.toolbar._active:    # prevent ops. if a toolbar zoom button pressed
                 # after any mouse release event (could be a zoom), redraw magnification lines
-                if magLineList: wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+                if magLineList: wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
                 return 
             # Background page, deal with fixed background points
@@ -2227 +2233 @@
                 backDict['FixedPoints'][G2frame.fixPtMarker] = xy
                 G2frame.itemPicked = None
-                wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+                wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
                 return
         
         if G2frame.itemPicked is None:
             # after any mouse release event (could be a zoom), redraw magnification lines
-            if magLineList: wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+            if magLineList: wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             return
         if DifLine[0] is G2frame.itemPicked:   # respond to dragging of the difference curve
@@ -2239 +2245 @@
             Page.plotStyle['delOffset'] = -ypos
             G2frame.itemPicked = None
-            wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
+            wx.CallAfter(PlotPatterns,G2frame,plotType=plottype,extraKeys=extraKeys)
             return
         elif G2frame.itemPicked in G2frame.MagLines: # drag of magnification marker
@@ -2326 +2332 @@
                         else:       #1st row of refl ticks
                             Page.plotStyle['refOffset'] = event.ydata
-        PlotPatterns(G2frame,plotType=plottype)
+        PlotPatterns(G2frame,plotType=plottype,extraKeys=extraKeys)
         G2frame.itemPicked = None
         
@@ -2339 +2345 @@
         newPlot = True
         G2frame.Cmax = 1.0
-        Page.canvas.mpl_connect('key_press_event', OnPlotKeyPress)
+#        Page.canvas.mpl_connect('key_press_event', OnPlotKeyPress)
         Page.canvas.mpl_connect('motion_notify_event', OnMotion)
         Page.canvas.mpl_connect('pick_event', OnPick)
         Page.canvas.mpl_connect('button_release_event', OnRelease)
         Page.canvas.mpl_connect('button_press_event',OnPress)
+        Page.bindings = []
+    # redo OnPlotKeyPress binding each time the Plot is updated
+    # since needs values that may have been changed after 1st call
+    for b in Page.bindings:
+        Page.canvas.mpl_disconnect(b)
+    Page.bindings = []
+    Page.bindings.append(
+        Page.canvas.mpl_connect('key_press_event', OnPlotKeyPress)
+    )
     if 'PWDR' in G2frame.GPXtree.GetItemText(G2frame.PickId):
         Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
@@ -2414 +2429 @@
                 Page.plotStyle['logPlot'] or Page.plotStyle['sqrtPlot'] or G2frame.Contour):
         Page.Choice = Page.Choice + ('a: add magnification region',)
+    for KeyItem in extraKeys:
+        Page.Choice = Page.Choice + (KeyItem[0] + ': '+KeyItem[2],)
     magLineList = [] # null value indicates no magnification
     Page.toolbar.updateActions = None # no update actions

trunk/GSASIIpwdGUI.py

@@ -3369 +3369 @@
             G2frame.GPXtree.SetItemPyData(UnitCellsId,data)
         
+    KeyList = []
+    def ClearCurrentShowNext():
+        KeepShowNext(False)
+    KeyList += [['j',ClearCurrentShowNext,'Show next Mag. Spc. Group, clear keep flag on current']]        
+    def KeepCurrentShowNext():
+        KeepShowNext(True)
+    KeyList += [['k',KeepCurrentShowNext,'Show next Mag. Spc. Group, keep current']]        
+    def KeepShowNext(KeepCurrent=True):
+        '''Show next "keep" item in Magnetic Space Group list, possibly resetting the 
+        keep flag for the current displayed cell
+        '''
+        for i in range(len(magcells)): # find plotted setting
+            if magcells[i]['Use']: break
+        else:
+            return # no Try is set
+        if not KeepCurrent:  # clear current
+            magcells[i]['Keep'] = False
+            MagCellsTable.SetValue(i,2,False)
+        keeps = [j for j in range(i+1,len(magcells)) if magcells[j]['Keep']]
+        if not keeps:
+            if not KeepCurrent: magDisplay.ForceRefresh()
+            return # no remaining Keep-flagged entries
+        next = keeps[0]
+        # update table
+        magcells[i]['Use'] = False
+        MagCellsTable.SetValue(i,1,False)
+        magcells[next]['Use'] = True
+        MagCellsTable.SetValue(next,1,True)
+        # get SG info and plot
+        SGData = magcells[next]['SGData']
+        A = G2lat.cell2A(magcells[next]['Cell'][:6])  
+        G2frame.HKL = G2pwd.getHKLpeak(1.0,SGData,A,Inst)
+        G2plt.PlotPatterns(G2frame,extraKeys=KeyList)
+        magDisplay.ForceRefresh()
+        # change Scroll to display new setting
+        xscroll = G2frame.dataWindow.GetScrollPos(wx.HORIZONTAL)
+        yscroll = magDisplay.CellToRect(next,1)[1]/G2frame.dataWindow.GetScrollPixelsPerUnit()[1]
+        G2frame.dataWindow.Scroll(xscroll,yscroll)
+        
     def RefreshMagCellsGrid(event):
         controls,bravais,cells,dminx,ssopt,magcells = G2frame.GPXtree.GetItemPyData(UnitCellsId)
@@ -3394 +3433 @@
                 A = G2lat.cell2A(magcells[r]['Cell'][:6])  
                 G2frame.HKL = G2pwd.getHKLpeak(1.0,mSGData,A,Inst)
-                G2plt.PlotPatterns(G2frame)
+                G2plt.PlotPatterns(G2frame,extraKeys=KeyList)
             elif c == 2:
                 if MagCellsTable.GetValue(r,c):
@@ -3661 +3700 @@
             A = G2lat.cell2A(magcells[0]['Cell'][:6])  
             G2frame.HKL = G2pwd.getHKLpeak(1.0,SGData,A,Inst)
-            G2plt.PlotPatterns(G2frame)
+            G2plt.PlotPatterns(G2frame,extraKeys=KeyList)
         data = [controls,bravais,cells,dmin,ssopt,magcells]
         G2frame.GPXtree.SetItemPyData(pUCid,data)
@@ -3946 +3985 @@
             G2frame.dataWindow.RunSubGroupsMag.Enable(True)
         G2frame.dataWindow.CopyCell.Enable(False)
-        Label = '\n Magnetic cells from Bilbao k-SUBGROUPSMAG for %s; kvec1: (%s), kvec2: (%s):'%(controls[13],''.join(controls[14][:3]),''.join(controls[14][3:]))
+        Label = '\n Magnetic cells from Bilbao k-SUBGROUPSMAG for %s; kvec1=(%s)'%(controls[13],''.join(controls[14][:3]))
+        kvec2 = ''.join(controls[14][3:])
+        if kvec2.strip():
+            Label += ', kvec2=(%s)' % kvec2
+        Label += ':'
         mainSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=Label),0,WACV)
         rowLabels = []