Changeset 2284 for trunk/GSASIIimgGUI.py

Timestamp:

May 20, 2016 12:37:52 PM (6 years ago)

Author:

vondreele

Message:

update binwin64 (probably no different from previous one)
add Stacking Fault-III to tutorial list
fixup HDF5 importer for images - now recovers wavelength, distance, pixel size, etc.
fix float/integer incompatibility in Flat Bkg values
enable/disable if calibrant/nocalibrant for both Calibrate & Recalibrate
fix a float/int error in mouse positioning on image

File:

• trunk/GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIimgGUI.py

@@ -166 +166 @@
             
     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
@@ -825 +823 @@
                 pass
             flatbkg.SetValue("%.0f"%(data['Flat Bkg']))    
-            G2frame.ImageZ += (oldFlat-data['Flat Bkg'])
+            G2frame.ImageZ += int(oldFlat-data['Flat Bkg'])
             ResetThresholds()
             G2plt.PlotExposedImage(G2frame,event=event)
@@ -890 +888 @@
                 
         def OnNewCalibrant(event):
-            data['calibrant'] = calSel.GetValue()
-            data['calibskip'] = calFile.Calibrants[data['calibrant']][3]
-            limits = calFile.Calibrants[data['calibrant']][4]
-            data['calibdmin'],data['pixLimit'],data['cutoff'] = limits
-            pixLimit.SetValue(str(limits[1]))
-            cutOff.SetValue('%.1f'%(limits[2]))
-            calibSkip.SetValue(str(data['calibskip']))
-            calibDmin.SetValue('%.1f'%(limits[0]))
+            data['calibrant'] = calSel.GetValue().strip()
+            if data['calibrant']:
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=True)
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=True)
+                data['calibskip'] = calFile.Calibrants[data['calibrant']][3]
+                limits = calFile.Calibrants[data['calibrant']][4]
+                data['calibdmin'],data['pixLimit'],data['cutoff'] = limits
+                pixLimit.SetValue(str(limits[1]))
+                cutOff.SetValue('%.1f'%(limits[2]))
+                calibSkip.SetValue(str(data['calibskip']))
+                calibDmin.SetValue('%.1f'%(limits[0]))
+            else:
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=False)
             
         def OnCalibSkip(event):
@@ -1084 +1088 @@
     if data.get('calibrant'):
         G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=True)
+        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=True)
     else:
         G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)
+        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=False)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrate, id=G2gd.wxID_IMINTEGRATE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrateAll, id=G2gd.wxID_INTEGRATEALL)