Changeset 2108

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

Location:

trunk

Files:

• GSASIIimage.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIimage.py

@@ -502 +502 @@
     
 def ImageRecalibrate(G2frame,data,masks):
-    'Needs a doc string'
+    '''Called to repeat the calibration on an image, usually called after
+    calibration is done initially to improve the fit.
+    '''
     import ImageCalibrants as calFile
     print 'Image recalibration:'
@@ -581 +583 @@
             
 def ImageCalibrate(G2frame,data):
-    'Needs a doc string'
+    '''Called to perform an initial image calibration after points have been
+    selected for the inner ring.
+    '''
     import copy
     import ImageCalibrants as calFile

trunk/GSASIIimgGUI.py

@@ -120 +120 @@
 # Menu items
             
-    def OnCalibrate(event):        
-        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=True)    
+    def OnCalibrate(event):
+        if not data.get('calibrant'):
+            G2G.G2MessageBox(G2frame,'A calibrant must first be selected')
         G2frame.dataFrame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick, RB on point to delete else RB to finish')
         G2frame.ifGetRing = True
@@ -133 +134 @@
         data['rings'] = []
         data['ellipses'] = []
-#        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)    
         G2plt.PlotExposedImage(G2frame,event=event)
             
@@ -351 +351 @@
                     S = File.readline()
                 data.update(save)
-                G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))                
+                # next line removed. Previous updates tree contents. The next
+                # makes a copy of data, puts it into tree and "disconnects" data
+                # from tree contents (later changes to data are lost!)
+                #G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))
                 File.close()
         finally:
@@ -1059 +1062 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnRecalibrate, id=G2gd.wxID_IMRECALIBRATE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnClearCalib, id=G2gd.wxID_IMCLEARCALIB)
-    if 'chisq' not in data:
-        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)    
+    if data.get('calibrant'):
+        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=True)
+    else:
+        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrate, id=G2gd.wxID_IMINTEGRATE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrateAll, id=G2gd.wxID_INTEGRATEALL)

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