Changeset 1994


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1969 r1994  
    8989
    9090[ wxID_IMCALIBRATE,wxID_IMRECALIBRATE,wxID_IMINTEGRATE, wxID_IMCLEARCALIB, 
    91     wxID_IMCOPYCONTROLS, wxID_INTEGRATEALL, wxID_IMSAVECONTROLS, wxID_IMLOADCONTROLS,
    92 ] = [wx.NewId() for item in range(8)]
     91    wxID_IMCOPYCONTROLS, wxID_INTEGRATEALL, wxID_IMSAVECONTROLS, wxID_IMLOADCONTROLS, wxID_IMAUTOINTEG,
     92] = [wx.NewId() for item in range(9)]
    9393
    9494[ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD, wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING,
     
    11091109        self.ImageEdit.Append(help='Load image controls from file',
    11101110            id=wxID_IMLOADCONTROLS, kind=wx.ITEM_NORMAL,text='Load Controls')
     1111        try: # remove after AutoInt is completed
     1112            import autoint
     1113            self.ImageEdit.Append(help='Open Auto-integration window to integrate a series of images',
     1114                id=wxID_IMAUTOINTEG, kind=wx.ITEM_NORMAL,text='Auto Integrate')
     1115            print "development code: AutoInt found"
     1116        except ImportError:
     1117            pass
    11111118        self.PostfillDataMenu()
    11121119           
  • trunk/GSASIIimgGUI.py

    r1944 r1994  
    117117        G2frame.dataFrame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick, RB on point to delete else RB to finish')
    118118        G2frame.ifGetRing = True
    119        
     119               
    120120    def OnRecalibrate(event):
    121121        G2img.ImageRecalibrate(G2frame,data,masks)
     
    10531053    G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveControls, id=G2gd.wxID_IMSAVECONTROLS)
    10541054    G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadControls, id=G2gd.wxID_IMLOADCONTROLS)
     1055    try: # remove after AutoInt is completed
     1056        import autoint
     1057        def OnAutoInt(event):
     1058            frame = autoint.AutoIntFrame(G2frame,PollTime=5.0)
     1059
     1060        G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoInt, id=G2gd.wxID_IMAUTOINTEG)
     1061        print "development code: AutoInt found"
     1062    except ImportError:
     1063        pass
    10551064    G2frame.dataDisplay = wx.Panel(G2frame.dataFrame)
    10561065
Note: See TracChangeset for help on using the changeset viewer.