Changeset 2538

Timestamp:

Nov 20, 2016 11:43:16 AM (6 years ago)

Author:

toby

Message:

add menu command to move a selected peak

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIgrid.py

@@ -1985 +1985 @@
         self.PeakEdit.Append(id=wxID_CLEARPEAKS, kind=wx.ITEM_NORMAL,text='Clear peaks', 
             help='Clear the peak list' )
+        self.movePeak = self.PeakEdit.Append(id=wx.ID_ANY,kind=wx.ITEM_NORMAL,text='Move selected peak',
+            help='Select a peak in the table, then use this to move it with the mouse.')
         self.PostfillDataMenu()
         self.UnDo.Enable(False)

trunk/GSASIIplot.py

@@ -1447 +1447 @@
         OnPick(None)
         
+    def onMovePeak(event):
+        selectedPeaks = list(set([row for row,col in G2frame.dataDisplay.GetSelectedCells()] +
+                                G2frame.dataDisplay.GetSelectedRows()))
+        if len(selectedPeaks) != 1:
+            G2G.G2MessageBox(G2frame,'You must select one peak in the table first. # selected ='+
+                             str(len(selectedPeaks)),'Select one peak')
+            return
+        #GSASIIpath.IPyBreak()
+        G2frame.itemPicked = G2frame.Lines[selectedPeaks[0]+2] # 1st 2 lines are limits
+        G2frame.G2plotNB.Parent.Raise()
+        OnPick(None)
+                        
     def OnPick(event):
         '''Respond to an item being picked. This usually means that the item
@@ -1490 +1502 @@
             Page.canvas.blit(Page.figure.gca().bbox)
 
-
         def OnDragDiffCurve(event):
             '''Respond to dragging of the difference curve
@@ -1506 +1517 @@
             mouse = 1
             pick = G2frame.itemPicked
+            ind = np.array([0])
         else: 
             if G2frame.itemPicked is not None: return
@@ -1528 +1540 @@
         PickId = G2frame.PickId
         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, add a new peak
                 data = G2frame.PatternTree.GetItemPyData(G2frame.PickId)
                 XY = G2mth.setPeakparms(Parms,Parms2,xy[0],xy[1])
@@ -1810 +1822 @@
             G2frame.dataFrame.moveTickLoc.Enable(True)
             G2frame.dataFrame.moveTickSpc.Enable(True)
+    elif G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Peak List':
+        G2frame.dataFrame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataFrame.movePeak.GetId())
     # save information needed to reload from tree and redraw
     kwargs={'PatternName':G2frame.PatternTree.GetItemText(G2frame.PatternId)}
@@ -2129 +2143 @@
                             [row for row,col in G2frame.dataDisplay.GetSelectedCells()] +
                             G2frame.dataDisplay.GetSelectedRows()))
+                        G2frame.dataFrame.movePeak.Enable(len(selectedPeaks) == 1) # allow peak move from table when one peak is selected
                         for i,item in enumerate(data['peaks']):
                             if i in selectedPeaks: