Changeset 2521

Timestamp:

Nov 13, 2016 8:27:56 PM (5 years ago)

Author:

toby

Message:

extensions to Peak List: vary via menu items; animate line dragging; highlight selected peak(s)

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -1956 +1956 @@
         self.PeakEdit = wx.Menu(title='')
         self.PeakMenu.Append(menu=self.PeakEdit, title='Peak Fitting')
+        self.peaksSel = self.PeakEdit.Append(wx.ID_ANY,
+            help='Set refinement flags for selected peaks',
+            kind=wx.ITEM_NORMAL,
+            text='Set sel. ref flags...')
+        self.peaksAll = self.PeakEdit.Append(wx.ID_ANY,
+            help='Set refinement flags for all peaks',
+            kind=wx.ITEM_NORMAL,
+            text='Set all ref flags...')
         self.AutoSearch = self.PeakEdit.Append(help='Automatic peak search', 
             id=wxID_AUTOSEARCH, kind=wx.ITEM_NORMAL,text='Auto search')

trunk/GSASIIphsGUI.py

@@ -1 @@
-        #indx = Atoms.GetSelectedRows()
 # -*- coding: utf-8 -*-
 #GSASII - phase data display routines

trunk/GSASIIplot.py

@@ -1462 +1462 @@
             xy[1] = xy[1]**2
         if G2frame.PatternTree.GetItemText(PickId) == 'Peak List':
-            if ind.all() != [0] and ObsLine[0].get_label() in str(pick):                                    #picked a data point
+            if ind.all() != [0] and ObsLine[0].get_label() in str(pick):    #picked a data point
                 data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
                 XY = G2mth.setPeakparms(Parms,Parms2,xy[0],xy[1])
@@ -1470 +1470 @@
                 PlotPatterns(G2frame,plotType=plottype)
             else:                                                   #picked a peak list line
+                # prepare to animate move of line
                 G2frame.itemPicked = pick
+                pick.set_linestyle(':') # set line as dotted
+                Page = G2frame.G2plotNB.nb.GetPage(plotNum)
+                Plot = Page.figure.gca()
+                Page.canvas.draw() # refresh without dotted line & save bitmap
+                savedplot = Page.canvas.copy_from_bbox(Page.figure.gca().bbox)
+                G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragLine)
+                pick.set_linestyle('--') # back to dashed
         elif G2frame.PatternTree.GetItemText(PickId) == 'Limits':
             if ind.all() != [0]:                                    #picked a data point
@@ -2003 +2011 @@
                         Page.canvas.SetToolTipString(tip)
                         data = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'))
-                        for item in data['peaks']:
+                        selectedPeaks = list(set(
+                            [row for row,col in G2frame.dataDisplay.GetSelectedCells()] +
+                            G2frame.dataDisplay.GetSelectedRows()))
+                        for i,item in enumerate(data['peaks']):
+                            if i in selectedPeaks:
+                                Ni = N+1
+                            else:
+                                Ni = N
                             if G2frame.plotStyle['qPlot']:
-                                Lines.append(Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,item[0]),color=colors[N%6],picker=2.))
+                                Lines.append(Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,item[0]),color=colors[Ni%6],picker=2.))
                             elif G2frame.plotStyle['dPlot']:
-                                Lines.append(Plot.axvline(G2lat.Pos2dsp(Parms,item[0]),color=colors[N%6],picker=2.))
+                                Lines.append(Plot.axvline(G2lat.Pos2dsp(Parms,item[0]),color=colors[Ni%6],picker=2.))
                             else:
-                                Lines.append(Plot.axvline(item[0],color=colors[N%6],picker=2.))
+                                Lines.append(Plot.axvline(item[0],color=colors[Ni%6],picker=2.))
                     if G2frame.PatternTree.GetItemText(PickId) == 'Limits':
                         tip = 'On data point: Lower limit - L MB; Upper limit - R MB. On limit: MB down to move'

trunk/GSASIIpwdGUI.py

@@ -745 +745 @@
         G2plt.PlotPatterns(G2frame,plotType='PWDR')
             
+    def SelectVars(rows):
+        '''Set or clear peak refinement variables for peaks listed in rows
+        '''
+        refOpts = {G2frame.dataDisplay.GetColLabelValue(i):i+1 for i in range(G2frame.dataDisplay.GetNumberCols()) if G2frame.dataDisplay.GetColLabelValue(i) != "refine"}
+        dlg = G2G.G2MultiChoiceDialog(
+            G2frame.dataFrame, 
+            'Select columns to refine',
+            'Refinement Selection', sorted(refOpts.keys()),
+            filterBox=False,toggle=False)
+        sels = []
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                sels = [sorted(refOpts.keys())[i] for i in dlg.GetSelections()]
+            else:
+                return
+        finally:
+            dlg.Destroy()
+        for r in rows:
+            for lbl,c in refOpts.iteritems():
+                data['peaks'][r][c] = lbl in sels
+        UpdatePeakGrid(G2frame,data)
+        
+    def OnRefineSelected(event):
+        '''set refinement flags for the selected peaks
+        '''
+        rows = list(set([row for row,col in G2frame.dataDisplay.GetSelectedCells()] +
+                        G2frame.dataDisplay.GetSelectedRows()))
+        if not rows:
+            wx.MessageBox('No selected rows. You must select rows or cells before using this command',
+                          caption='No selected peaks')
+            return
+        SelectVars(rows)
+
+    def OnRefineAll(event):
+        '''set refinement flags for all peaks
+        '''
+        SelectVars(range(G2frame.dataDisplay.GetNumberRows()))
+
+    def onSelectedRow(event):
+        '''Called when a peak is selected so that it can be highlighted in the plot
+        '''
+        event.Skip()
+        wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='PWDR')
+                           
+    #======================================================================
+    # beginning of UpdatePeakGrid init
+    #======================================================================
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.PeakMenu)
     if not G2frame.dataFrame.GetStatusBar():
@@ -752 +799 @@
     G2frame.Bind(wx.EVT_MENU, OnCopyPeaks, id=G2gd.wxID_PEAKSCOPY)
     G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_UNDO)
+    G2frame.Bind(wx.EVT_MENU, OnRefineSelected, id=G2frame.dataFrame.peaksSel.GetId())
+    G2frame.Bind(wx.EVT_MENU, OnRefineAll, id=G2frame.dataFrame.peaksAll.GetId())
     G2frame.Bind(wx.EVT_MENU, OnLSQPeakFit, id=G2gd.wxID_LSQPEAKFIT)
     G2frame.Bind(wx.EVT_MENU, OnOneCycle, id=G2gd.wxID_LSQONECYCLE)
@@ -807 +856 @@
     G2frame.dataDisplay.Bind(wg.EVT_GRID_CELL_CHANGE, RefreshPeakGrid)
     G2frame.dataDisplay.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
+    G2frame.dataDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK, onSelectedRow)
+    G2frame.dataDisplay.Bind(wg.EVT_GRID_CELL_LEFT_CLICK, onSelectedRow)
     G2frame.dataDisplay.SetMargins(0,0)
     G2frame.dataDisplay.AutoSizeColumns(False)
     G2frame.dataFrame.setSizePosLeft([535,350])
     G2frame.dataFrame.SendSizeEvent()
-        
+
 ################################################################################
 #####  Background