Changeset 1994

Timestamp:

Oct 8, 2015 7:02:13 PM (6 years ago)

Author:

toby

Message:

additions to test Andrey's Auto Image Integration

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -89 +89 @@
 
 [ wxID_IMCALIBRATE,wxID_IMRECALIBRATE,wxID_IMINTEGRATE, wxID_IMCLEARCALIB,  
-    wxID_IMCOPYCONTROLS, wxID_INTEGRATEALL, wxID_IMSAVECONTROLS, wxID_IMLOADCONTROLS,
-] = [wx.NewId() for item in range(8)]
+    wxID_IMCOPYCONTROLS, wxID_INTEGRATEALL, wxID_IMSAVECONTROLS, wxID_IMLOADCONTROLS, wxID_IMAUTOINTEG,
+] = [wx.NewId() for item in range(9)]
 
 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD, wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING,
@@ -1109 +1109 @@
         self.ImageEdit.Append(help='Load image controls from file', 
             id=wxID_IMLOADCONTROLS, kind=wx.ITEM_NORMAL,text='Load Controls')
+        try: # remove after AutoInt is completed
+            import autoint
+            self.ImageEdit.Append(help='Open Auto-integration window to integrate a series of images', 
+                id=wxID_IMAUTOINTEG, kind=wx.ITEM_NORMAL,text='Auto Integrate')
+            print "development code: AutoInt found"
+        except ImportError:
+            pass
         self.PostfillDataMenu()
             

trunk/GSASIIimgGUI.py

@@ -117 +117 @@
         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
-        
+                
     def OnRecalibrate(event):
         G2img.ImageRecalibrate(G2frame,data,masks)
@@ -1053 +1053 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveControls, id=G2gd.wxID_IMSAVECONTROLS)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadControls, id=G2gd.wxID_IMLOADCONTROLS)
+    try: # remove after AutoInt is completed
+        import autoint
+        def OnAutoInt(event):
+            frame = autoint.AutoIntFrame(G2frame,PollTime=5.0)
+
+        G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoInt, id=G2gd.wxID_IMAUTOINTEG)
+        print "development code: AutoInt found"
+    except ImportError:
+        pass
     G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)