Changeset 3952

Timestamp:

May 3, 2019 2:56:06 PM (6 years ago)

Author:

toby

Message:

PickId? set to zero(?)

File:

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

trunk/GSASIIplot.py ¶

@@ -2225 +2225 @@
         PatternId = G2frame.PatternId
         PickId = G2frame.PickId
-        if G2frame.GPXtree.GetItemText(PickId) == 'Peak List':
+        if PickId and G2frame.GPXtree.GetItemText(PickId) == 'Peak List':
             if ind.all() != [0] and ObsLine[0].get_label() in str(pick):    #picked a data point, add a new peak
                 data = G2frame.GPXtree.GetItemPyData(G2frame.PickId)
@@ -2243 +2243 @@
                 G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragLine)
                 pick.set_linestyle('--') # back to dashed
-        elif G2frame.GPXtree.GetItemText(PickId) == 'Limits':
+        elif PickId and G2frame.GPXtree.GetItemText(PickId) == 'Limits':
             if ind.all() != [0]:                                    #picked a data point
                 LimitId = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits')
@@ -2276 +2276 @@
                 pick.set_linestyle('--') # back to dashed
                 
-        elif G2frame.GPXtree.GetItemText(PickId) == 'Models':
+        elif PickId and G2frame.GPXtree.GetItemText(PickId) == 'Models':
             if ind.all() != [0]:                                    #picked a data point
                 LimitId = G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Limits')
@@ -2288 +2288 @@
             else:                                                   #picked a limit line
                 G2frame.itemPicked = pick
-        elif (G2frame.GPXtree.GetItemText(PickId) == 'Reflection Lists' or
+        elif PickId and (G2frame.GPXtree.GetItemText(PickId) == 'Reflection Lists' or
                 'PWDR' in G2frame.GPXtree.GetItemText(PickId)
                 ):
@@ -2325 +2325 @@
                 G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragTickmarks)
             
-        elif G2frame.GPXtree.GetItemText(PickId) == 'Background':
+        elif PickId and G2frame.GPXtree.GetItemText(PickId) == 'Background':
             # selected a fixed background point. Can move it or delete it.
             backPts = G2frame.dataWindow.wxID_BackPts
@@ -2735 +2735 @@
     Page.bindings = []
     Page.bindings.append(Page.canvas.mpl_connect('key_press_event', OnPlotKeyPress))
-    if 'PWDR' in G2frame.GPXtree.GetItemText(G2frame.PickId):
+    if not G2frame.PickId:
+        pass
+    elif 'PWDR' in G2frame.GPXtree.GetItemText(G2frame.PickId):
         Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
         refColors=['b','r','c','g','m','k']