Changeset 2540 for trunk/GSASIIplot.py

Timestamp:

Nov 21, 2016 1:04:32 PM (6 years ago)

Author:

toby

Message:

disable move menu command when there is no difference curve

File:

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

trunk/GSASIIplot.py

@@ -1214 +1214 @@
     '''
     global exclLines
-    global DifLine
+    global DifLine # BHT: probably does not need to be global
     global Ymax
     global Pattern
@@ -1423 +1423 @@
         '''Respond to a menu command to move the difference curve. 
         '''
+        if not DifLine[0]:
+            print('No difference curve!')
+            return
         G2frame.itemPicked = DifLine[0]
         G2frame.G2plotNB.Parent.Raise()
@@ -1813 +1816 @@
         G2frame.dataFrame.Bind(wx.EVT_MENU, onMoveTopTick, id=G2frame.dataFrame.moveTickLoc.GetId())
         G2frame.dataFrame.Bind(wx.EVT_MENU, onMoveTickSpace, id=G2frame.dataFrame.moveTickSpc.GetId())
-        if len(Page.phaseList) == 0:
-            G2frame.dataFrame.moveTickLoc.Enable(False)
-            G2frame.dataFrame.moveTickSpc.Enable(False)
-        elif len(Page.phaseList) == 1:
-            G2frame.dataFrame.moveTickLoc.Enable(True)
-            G2frame.dataFrame.moveTickSpc.Enable(False)
-        else:
-            G2frame.dataFrame.moveTickLoc.Enable(True)
-            G2frame.dataFrame.moveTickSpc.Enable(True)
+        G2frame.dataFrame.moveDiffCurve.Enable(False)
+        G2frame.dataFrame.moveTickLoc.Enable(False)
+        G2frame.dataFrame.moveTickSpc.Enable(False)
     elif G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Peak List':
         G2frame.dataFrame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataFrame.movePeak.GetId())
@@ -1833 +1830 @@
     # now start plotting
     G2frame.G2plotNB.status.DestroyChildren()
+    Page.tickDict = {}
+    DifLine = ['']
     if G2frame.Contour:
         Page.Choice = (' key press','d: lower contour max','u: raise contour max','o: reset contour max',
@@ -2042 +2041 @@
                 X += 0.002*offsetX*DX*N
             Xum = ma.getdata(X)
-            DifLine = ['']
             if ifpicked:
                 if G2frame.plotStyle['sqrtPlot']:
@@ -2202 +2200 @@
             refColors=['b','r','c','g','m','k']
             Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
-            Page.tickDict = {}
             for pId,phase in enumerate(Page.phaseList):
                 if 'list' in str(type(Phases[phase])):
@@ -2274 +2271 @@
     # and sqrt(-ve) in np.where usage               
 #    G2frame.Pwdr = True
+    if 'PWDR' in G2frame.PatternTree.GetItemText(G2frame.PickId):
+        if len(Page.tickDict.keys()) == 1:
+            G2frame.dataFrame.moveTickLoc.Enable(True)
+        elif len(Page.tickDict.keys()) > 1:
+            G2frame.dataFrame.moveTickLoc.Enable(True)
+            G2frame.dataFrame.moveTickSpc.Enable(True)
+        if DifLine[0]:
+            G2frame.dataFrame.moveDiffCurve.Enable(True)
     
 ################################################################################