Changeset 1994
- Timestamp:
- Oct 8, 2015 7:02:13 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r1969 r1994 89 89 90 90 [ 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)] 93 93 94 94 [ wxID_MASKCOPY, wxID_MASKSAVE, wxID_MASKLOAD, wxID_NEWMASKSPOT,wxID_NEWMASKARC,wxID_NEWMASKRING, … … 1109 1109 self.ImageEdit.Append(help='Load image controls from file', 1110 1110 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 1111 1118 self.PostfillDataMenu() 1112 1119 -
trunk/GSASIIimgGUI.py
r1944 r1994 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') 118 118 G2frame.ifGetRing = True 119 119 120 120 def OnRecalibrate(event): 121 121 G2img.ImageRecalibrate(G2frame,data,masks) … … 1053 1053 G2frame.dataFrame.Bind(wx.EVT_MENU, OnSaveControls, id=G2gd.wxID_IMSAVECONTROLS) 1054 1054 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 1055 1064 G2frame.dataDisplay = wx.Panel(G2frame.dataFrame) 1056 1065
Note: See TracChangeset
for help on using the changeset viewer.