Changeset 2108 for trunk/GSASIIplot.py

Timestamp:

Dec 24, 2015 9:10:30 PM (7 years ago)

Author:

toby

Message:

Bug fix for Andrey: 5. Allow recalibrate after load controls on new image; fix to load image controls and change to enable of Recalibrate

File:

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

trunk/GSASIIplot.py

@@ -3609 +3609 @@
     import numpy.ma as ma
     Dsp = lambda tth,wave: wave/(2.*npsind(tth/2.))
-    global Data,Masks,StrSta
+    #global Data,Masks,StrSta  # BHT: I don't see why these need to be globals. Where are they accessed? 
     colors=['b','g','r','c','m','k']
     Data = G2frame.PatternTree.GetItemPyData(
@@ -3915 +3915 @@
             G2frame.itemPicked = None
             
-    # PlotImage execution starts here        
+    # PlotImage execution starts here
     xylim = []
     try:
@@ -4072 +4072 @@
                     xring,yring = np.array(ring).T[:2]
                     Plot.plot(xring,yring,'.',color=colors[N%6])
-                    N += 1            
+                    N += 1
             for ellipse in Data['ellipses']:      #what about hyperbola?
                 cent,phi,[width,height],col = ellipse