Changeset 1545
- Timestamp:
- Oct 27, 2014 2:06:37 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIconstrGUI.py
r1542 r1545 1051 1051 text = G2frame.dataDisplay.GetPageText(page) 1052 1052 if text == 'Vector rigid bodies': 1053 G2 frame.dataFrame.RigidBodyMenu.Remove(0) #NB: wx.MenuBar.Replace gives error1054 G2frame.dataFrame. RigidBodyMenu.Insert(0,G2frame.dataFrame.VectorRBEdit,title='Edit')1053 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.VectorBodyMenu) 1054 G2frame.dataFrame.Bind(wx.EVT_MENU, AddVectorRB, id=G2gd.wxID_VECTORBODYADD) 1055 1055 G2frame.Page = [page,'vrb'] 1056 1056 UpdateVectorRB() 1057 1057 elif text == 'Residue rigid bodies': 1058 G2frame.dataFrame.RigidBodyMenu.Remove(0) 1059 G2frame.dataFrame.RigidBodyMenu.Insert(0,G2frame.dataFrame.ResidueRBMenu,title='Edit') 1058 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodyMenu) 1059 G2frame.dataFrame.Bind(wx.EVT_MENU, AddResidueRB, id=G2gd.wxID_RIGIDBODYADD) 1060 G2frame.dataFrame.Bind(wx.EVT_MENU, OnImportRigidBody, id=G2gd.wxID_RIGIDBODYIMPORT) 1061 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineTorsSeq, id=G2gd.wxID_RESIDUETORSSEQ) 1060 1062 G2frame.Page = [page,'rrb'] 1061 1063 UpdateResidueRB() … … 1082 1084 1083 1085 def getTextFile(): 1084 print 'getTextfile'1085 1086 defDir = os.path.join(os.path.split(__file__)[0],'GSASIImacros') 1086 1087 dlg = wx.FileDialog(G2frame,'Choose rigid body text file', '.', '', … … 1102 1103 return text,ext.lower() 1103 1104 1104 def OnAddRigidBody(event):1105 page = G2frame.dataDisplay.GetSelection()1106 if 'Vector' in G2frame.dataDisplay.GetPageText(page):1107 AddVectorRB()1108 elif 'Residue' in G2frame.dataDisplay.GetPageText(page):1109 AddResidueRB()1110 1111 1105 def OnImportRigidBody(event): 1112 1106 page = G2frame.dataDisplay.GetSelection() … … 1116 1110 ImportResidueRB() 1117 1111 1118 def AddVectorRB( ):1112 def AddVectorRB(event): 1119 1113 AtInfo = data['Vector']['AtInfo'] 1120 1114 dlg = MultiIntegerDialog(G2frame.dataDisplay,'New Rigid Body',['No. atoms','No. translations'],[1,1]) … … 1135 1129 UpdateVectorRB() 1136 1130 1137 def AddResidueRB( ):1131 def AddResidueRB(event): 1138 1132 AtInfo = data['Residue']['AtInfo'] 1139 1133 macro = getMacroFile('rigid body') … … 1827 1821 SetStatusLine('') 1828 1822 1829 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodyMenu)1830 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAddRigidBody, id=G2gd.wxID_RIGIDBODYADD)1831 # no menu items yet1832 G2frame.dataFrame.Bind(wx.EVT_MENU, OnImportRigidBody, id=G2gd.wxID_RIGIDBODYIMPORT)1833 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineTorsSeq, id=G2gd.wxID_RESIDUETORSSEQ)1834 1823 G2frame.dataDisplay = G2gd.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize()) 1835 1824 … … 1840 1829 UpdateVectorRB() 1841 1830 G2frame.dataDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged) 1842 1831 OnPageChanged(None) -
trunk/GSASIIgrid.py
r1529 r1545 134 134 [ wxID_RIGIDBODYADD,wxID_DRAWDEFINERB,wxID_RIGIDBODYIMPORT,wxID_RESIDUETORSSEQ, 135 135 wxID_AUTOFINDRESRB,wxID_GLOBALRESREFINE,wxID_RBREMOVEALL,wxID_COPYRBPARMS, 136 wxID_GLOBALTHERM, 137 ] = [wx.NewId() for item in range( 9)]136 wxID_GLOBALTHERM,wxID_VECTORBODYADD 137 ] = [wx.NewId() for item in range(10)] 138 138 139 139 [ wxID_RENAMESEQSEL,wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_PLOTSEQSEL, … … 3123 3123 self.ConstraintEdit.Append(id=wxID_FUNCTADD, kind=wx.ITEM_NORMAL,text='Add New Var', 3124 3124 help='Add variable composed of existing parameter') 3125 self.PostfillDataMenu() 3125 3126 3126 3127 # item = self.ConstraintEdit.Append(id=wx.ID_ANY,kind=wx.ITEM_NORMAL,text='Update GUI') … … 3132 3133 # self.Bind(wx.EVT_MENU,UpdateGSASIIconstrGUI,id=item.GetId()) 3133 3134 3134 self.PostfillDataMenu()3135 3136 3135 # Rigid bodies 3137 self.VectorRBEdit = wx.Menu(title='') 3138 self.VectorRBEdit.Append(id=wxID_RIGIDBODYADD, kind=wx.ITEM_NORMAL,text='Add rigid body', 3139 help='Add vector rigid body') 3136 self.RigidBodyMenu = wx.MenuBar() 3137 self.PrefillDataMenu(self.RigidBodyMenu,helpType='Rigid bodies') 3140 3138 self.ResidueRBMenu = wx.Menu(title='') 3141 3139 self.ResidueRBMenu.Append(id=wxID_RIGIDBODYIMPORT, kind=wx.ITEM_NORMAL,text='Import XYZ', … … 3145 3143 self.ResidueRBMenu.Append(id=wxID_RIGIDBODYADD, kind=wx.ITEM_NORMAL,text='Import residues', 3146 3144 help='Import residue rigid bodies from macro file') 3147 3148 self.RigidBodyMenu = wx.MenuBar() 3149 self.PrefillDataMenu(self.RigidBodyMenu,helpType='Rigid bodies') 3150 self.RigidBodyMenu.Append(menu=self.VectorRBEdit, title='Edit') 3145 self.RigidBodyMenu.Append(menu=self.ResidueRBMenu, title='Edit Body') 3151 3146 self.PostfillDataMenu() 3152 3147 3148 self.VectorBodyMenu = wx.MenuBar() 3149 self.PrefillDataMenu(self.VectorBodyMenu,helpType='Vector rigid bodies') 3150 self.VectorRBEdit = wx.Menu(title='') 3151 self.VectorRBEdit.Append(id=wxID_VECTORBODYADD, kind=wx.ITEM_NORMAL,text='Add rigid body', 3152 help='Add vector rigid body') 3153 self.VectorBodyMenu.Append(menu=self.VectorRBEdit, title='Edit Vector Body') 3154 self.PostfillDataMenu() 3155 3156 3153 3157 # Restraints 3154 3158 self.RestraintTab = wx.Menu(title='') … … 3696 3700 # self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture', 3697 3701 # help='Refine the texture coefficients from sequential Pawley results') 3702 # N.B. Binding is now commented out 3698 3703 self.TextureEdit.Append(id=wxID_CLEARTEXTURE, kind=wx.ITEM_NORMAL,text='Clear texture', 3699 3704 help='Clear the texture coefficients' ) -
trunk/GSASIIphsGUI.py
r1540 r1545 59 59 mapDefault = {'MapType':'','RefList':'','Resolution':0.5,'Show bonds':True, 60 60 'rho':[],'rhoMax':0.,'mapSize':10.0,'cutOff':50.,'Flip':False} 61 TabSelectionIdDict = {} 61 62 # trig functions in degrees 62 63 sind = lambda x: np.sin(x*np.pi/180.) … … 5455 5456 event.Skip() 5456 5457 5457 def FillSelectPageMenu( menuBar):5458 def FillSelectPageMenu(TabSelectionIdDict, menuBar): 5458 5459 '''Fill "Select tab" menu with menu items for each tab and assign 5459 5460 bindings to the menu ietm to switch between phase tabs … … 5462 5463 'Called when an item is selected from the Select page menu' 5463 5464 # lookup the menu item that called us and get its text 5464 mid = menuBar.FindMenu('Select tab') 5465 menu = menuBar.GetMenu(mid) 5466 tabname = menu.FindItemById(event.GetId()).GetLabel() 5465 tabname = TabSelectionIdDict.get(event.GetId()) 5466 if not tabname: 5467 print 'Warning: menu item not in dict! id=',event.GetId() 5468 return 5467 5469 # find the matching tab 5468 5470 for PageNum in range(G2frame.dataDisplay.GetPageCount()): … … 5473 5475 print "Warning: tab "+tabname+" was not found" 5474 5476 mid = menuBar.FindMenu('Select tab') 5477 menu = menuBar.GetMenu(mid) 5475 5478 for ipage,page in enumerate(Pages): 5476 menu = menuBar.GetMenu(mid) 5477 if menu.FindItem(page) < 0: 5479 if menu.FindItem(page) < 0: # is tab already in menu? 5478 5480 Id = wx.NewId() 5481 TabSelectionIdDict[Id] = page 5479 5482 menu.Append(id=Id,kind=wx.ITEM_NORMAL,text=page) 5480 5483 G2frame.Bind(wx.EVT_MENU, OnSelectPage, id=Id) … … 5491 5494 5492 5495 def ChangePage(page): 5493 # development: Log Tab Selection5494 #G2gd.LogTabPress(G2frame,page)5495 5496 text = G2frame.dataDisplay.GetPageText(page) 5496 # print 'Select',page,text5497 5497 if text == 'General': 5498 5498 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral) 5499 FillSelectPageMenu(G2frame.dataFrame.DataGeneral)5500 G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourierMaps, id=G2gd.wxID_FOURCALC)5501 G2frame.dataFrame.Bind(wx.EVT_MENU, OnSearchMaps, id=G2gd.wxID_FOURSEARCH)5502 G2frame.dataFrame.Bind(wx.EVT_MENU, OnChargeFlip, id=G2gd.wxID_CHARGEFLIP)5503 G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourClear, id=G2gd.wxID_FOURCLEAR)5504 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunSingleMCSA, id=G2gd.wxID_SINGLEMCSA)5505 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunMultiMCSA, id=G2gd.wxID_MULTIMCSA)5506 5499 UpdateGeneral() 5507 5500 elif text == 'Data': 5508 5501 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataMenu) 5509 FillSelectPageMenu(G2frame.dataFrame.DataMenu)5510 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPwdrAdd, id=G2gd.wxID_PWDRADD)5511 G2frame.dataFrame.Bind(wx.EVT_MENU, OnHklfAdd, id=G2gd.wxID_HKLFADD)5512 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDataDelete, id=G2gd.wxID_DATADELETE)5513 5502 G2ddG.UpdateDData(G2frame,DData,data) 5514 5503 G2plt.PlotSizeStrainPO(G2frame,data,Start=True) 5515 5504 elif text == 'Atoms': 5516 5505 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.AtomsMenu) 5517 FillSelectPageMenu(G2frame.dataFrame.AtomsMenu)5518 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomAdd, id=G2gd.wxID_ATOMSEDITADD)5519 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomViewAdd, id=G2gd.wxID_ATOMSVIEWADD)5520 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomInsert, id=G2gd.wxID_ATOMSEDITINSERT)5521 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomViewInsert, id=G2gd.wxID_ATOMVIEWINSERT)5522 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomMove, id=G2gd.wxID_ATOMMOVE)5523 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomDelete, id=G2gd.wxID_ATOMSEDITDELETE)5524 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomRefine, id=G2gd.wxID_ATOMSREFINE)5525 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomModify, id=G2gd.wxID_ATOMSMODIFY)5526 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomTransform, id=G2gd.wxID_ATOMSTRANSFORM)5527 G2frame.dataFrame.Bind(wx.EVT_MENU, OnReloadDrawAtoms, id=G2gd.wxID_RELOADDRAWATOMS)5528 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDistAngle, id=G2gd.wxID_ATOMSDISAGL)5529 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDistAnglePrt, id=G2gd.wxID_ATOMSPDISAGL)5530 G2frame.dataFrame.Bind(wx.EVT_MENU, OnIsoDistortCalc, id=G2gd.wxID_ISODISP)5531 for id in G2frame.dataFrame.ReImportMenuId: #loop over submenu items5532 G2frame.dataFrame.Bind(wx.EVT_MENU, OnReImport, id=id)5533 5506 FillAtomsGrid(Atoms) 5534 5507 elif text == 'Wave Data' and data['General']['Type'] in ['modulated','magnetic']: 5535 5508 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.WavesData) 5536 FillSelectPageMenu(G2frame.dataFrame.WavesData)5537 5509 UpdateWavesData() 5538 5510 wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True) 5539 5511 elif text == 'Draw Options': 5540 5512 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataDrawOptions) 5541 FillSelectPageMenu(G2frame.dataFrame.DataDrawOptions)5542 5513 UpdateDrawOptions() 5543 5514 wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True) 5544 5515 elif text == 'Draw Atoms': 5545 5516 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DrawAtomsMenu) 5546 FillSelectPageMenu(G2frame.dataFrame.DrawAtomsMenu)5547 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomStyle, id=G2gd.wxID_DRAWATOMSTYLE)5548 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomLabel, id=G2gd.wxID_DRAWATOMLABEL)5549 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomColor, id=G2gd.wxID_DRAWATOMCOLOR)5550 G2frame.dataFrame.Bind(wx.EVT_MENU, ResetAtomColors, id=G2gd.wxID_DRAWATOMRESETCOLOR)5551 G2frame.dataFrame.Bind(wx.EVT_MENU, SetViewPoint, id=G2gd.wxID_DRAWVIEWPOINT)5552 G2frame.dataFrame.Bind(wx.EVT_MENU, AddSymEquiv, id=G2gd.wxID_DRAWADDEQUIV)5553 G2frame.dataFrame.Bind(wx.EVT_MENU, TransformSymEquiv, id=G2gd.wxID_DRAWTRANSFORM)5554 G2frame.dataFrame.Bind(wx.EVT_MENU, FillCoordSphere, id=G2gd.wxID_DRAWFILLCOORD)5555 G2frame.dataFrame.Bind(wx.EVT_MENU, FillUnitCell, id=G2gd.wxID_DRAWFILLCELL)5556 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomsDelete, id=G2gd.wxID_DRAWDELETE)5557 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDrawDistVP, id=G2gd.wxID_DRAWDISTVP)5558 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDrawDAT, id=G2gd.wxID_DRAWDISAGLTOR)5559 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDrawPlane, id=G2gd.wxID_DRAWPLANE)5560 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRBOND)5561 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRANGLE)5562 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRPLANE)5563 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRCHIRAL)5564 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineRB, id=G2gd.wxID_DRAWDEFINERB)5565 5517 UpdateDrawAtoms() 5566 5518 wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True) 5567 5519 elif text == 'RB Models': 5568 5520 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodiesMenu) 5569 FillSelectPageMenu(G2frame.dataFrame.RigidBodiesMenu)5570 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoFindResRB, id=G2gd.wxID_AUTOFINDRESRB)5571 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBAssign, id=G2gd.wxID_ASSIGNATMS2RB)5572 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBCopyParms, id=G2gd.wxID_COPYRBPARMS)5573 G2frame.dataFrame.Bind(wx.EVT_MENU, OnGlobalResRBTherm, id=G2gd.wxID_GLOBALTHERM)5574 G2frame.dataFrame.Bind(wx.EVT_MENU, OnGlobalResRBRef, id=G2gd.wxID_GLOBALRESREFINE)5575 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBRemoveAll, id=G2gd.wxID_RBREMOVEALL)5576 5521 FillRigidBodyGrid() 5577 5522 elif text == 'Map peaks': 5578 5523 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.MapPeaksMenu) 5579 FillSelectPageMenu(G2frame.dataFrame.MapPeaksMenu)5580 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksMove, id=G2gd.wxID_PEAKSMOVE)5581 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksViewPoint, id=G2gd.wxID_PEAKSVIEWPT)5582 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksDistVP, id=G2gd.wxID_PEAKSDISTVP)5583 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksDA, id=G2gd.wxID_PEAKSDA)5584 G2frame.dataFrame.Bind(wx.EVT_MENU, OnShowBonds, id=G2gd.wxID_SHOWBONDS)5585 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksEquiv, id=G2gd.wxID_FINDEQVPEAKS)5586 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksUnique, id=G2gd.wxID_PEAKSUNIQUE)5587 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksDelete, id=G2gd.wxID_PEAKSDELETE)5588 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2gd.wxID_PEAKSCLEAR)5589 5524 FillMapPeaksGrid() 5590 5525 wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True) 5591 5526 elif text == 'MC/SA': 5592 5527 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.MCSAMenu) 5593 FillSelectPageMenu(G2frame.dataFrame.MCSAMenu)5594 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAaddAtom, id=G2gd.wxID_ADDMCSAATOM)5595 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAaddRB, id=G2gd.wxID_ADDMCSARB)5596 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAclear, id=G2gd.wxID_CLEARMCSARB)5597 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAmove, id=G2gd.wxID_MOVEMCSA)5598 G2frame.dataFrame.Bind(wx.EVT_MENU, OnClearResults, id=G2gd.wxID_MCSACLEARRESULTS)5599 5528 UpdateMCSA() 5600 5529 wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True) 5601 5530 elif text == 'Texture': 5602 5531 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.TextureMenu) 5603 FillSelectPageMenu(G2frame.dataFrame.TextureMenu)5604 G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureRefine, id=G2gd.wxID_REFINETEXTURE)5605 G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureClear, id=G2gd.wxID_CLEARTEXTURE)5606 5532 UpdateTexture() 5607 5533 G2plt.PlotTexture(G2frame,data,Start=True) 5608 5534 elif text == 'Pawley reflections': 5609 5535 G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.PawleyMenu) 5610 FillSelectPageMenu(G2frame.dataFrame.PawleyMenu)5611 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyLoad, id=G2gd.wxID_PAWLEYLOAD)5612 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE)5613 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE)5614 5536 FillPawleyReflectionsGrid() 5615 5537 else: 5616 5538 G2gd.SetDataMenuBar(G2frame) 5617 5539 def FillMenus(): 5540 '''Create the Select tab menus and bind to all menu items 5541 ''' 5542 print 'FillMenus' 5543 # General 5544 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.DataGeneral) 5545 G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourierMaps, id=G2gd.wxID_FOURCALC) 5546 G2frame.dataFrame.Bind(wx.EVT_MENU, OnSearchMaps, id=G2gd.wxID_FOURSEARCH) 5547 G2frame.dataFrame.Bind(wx.EVT_MENU, OnChargeFlip, id=G2gd.wxID_CHARGEFLIP) 5548 G2frame.dataFrame.Bind(wx.EVT_MENU, OnFourClear, id=G2gd.wxID_FOURCLEAR) 5549 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunSingleMCSA, id=G2gd.wxID_SINGLEMCSA) 5550 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRunMultiMCSA, id=G2gd.wxID_MULTIMCSA) 5551 # Data 5552 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.DataMenu) 5553 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPwdrAdd, id=G2gd.wxID_PWDRADD) 5554 G2frame.dataFrame.Bind(wx.EVT_MENU, OnHklfAdd, id=G2gd.wxID_HKLFADD) 5555 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDataDelete, id=G2gd.wxID_DATADELETE) 5556 # Atoms 5557 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.AtomsMenu) 5558 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomAdd, id=G2gd.wxID_ATOMSEDITADD) 5559 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomViewAdd, id=G2gd.wxID_ATOMSVIEWADD) 5560 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomInsert, id=G2gd.wxID_ATOMSEDITINSERT) 5561 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomViewInsert, id=G2gd.wxID_ATOMVIEWINSERT) 5562 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAtomMove, id=G2gd.wxID_ATOMMOVE) 5563 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomDelete, id=G2gd.wxID_ATOMSEDITDELETE) 5564 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomRefine, id=G2gd.wxID_ATOMSREFINE) 5565 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomModify, id=G2gd.wxID_ATOMSMODIFY) 5566 G2frame.dataFrame.Bind(wx.EVT_MENU, AtomTransform, id=G2gd.wxID_ATOMSTRANSFORM) 5567 G2frame.dataFrame.Bind(wx.EVT_MENU, OnReloadDrawAtoms, id=G2gd.wxID_RELOADDRAWATOMS) 5568 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDistAngle, id=G2gd.wxID_ATOMSDISAGL) 5569 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDistAnglePrt, id=G2gd.wxID_ATOMSPDISAGL) 5570 G2frame.dataFrame.Bind(wx.EVT_MENU, OnIsoDistortCalc, id=G2gd.wxID_ISODISP) 5571 for id in G2frame.dataFrame.ReImportMenuId: #loop over submenu items 5572 G2frame.dataFrame.Bind(wx.EVT_MENU, OnReImport, id=id) 5573 # Wave Data 5574 if data['General']['Type'] in ['modulated','magnetic']: 5575 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.WavesData) 5576 # Draw Options 5577 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.DataDrawOptions) 5578 # Draw Atoms 5579 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.DrawAtomsMenu) 5580 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomStyle, id=G2gd.wxID_DRAWATOMSTYLE) 5581 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomLabel, id=G2gd.wxID_DRAWATOMLABEL) 5582 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomColor, id=G2gd.wxID_DRAWATOMCOLOR) 5583 G2frame.dataFrame.Bind(wx.EVT_MENU, ResetAtomColors, id=G2gd.wxID_DRAWATOMRESETCOLOR) 5584 G2frame.dataFrame.Bind(wx.EVT_MENU, SetViewPoint, id=G2gd.wxID_DRAWVIEWPOINT) 5585 G2frame.dataFrame.Bind(wx.EVT_MENU, AddSymEquiv, id=G2gd.wxID_DRAWADDEQUIV) 5586 G2frame.dataFrame.Bind(wx.EVT_MENU, TransformSymEquiv, id=G2gd.wxID_DRAWTRANSFORM) 5587 G2frame.dataFrame.Bind(wx.EVT_MENU, FillCoordSphere, id=G2gd.wxID_DRAWFILLCOORD) 5588 G2frame.dataFrame.Bind(wx.EVT_MENU, FillUnitCell, id=G2gd.wxID_DRAWFILLCELL) 5589 G2frame.dataFrame.Bind(wx.EVT_MENU, DrawAtomsDelete, id=G2gd.wxID_DRAWDELETE) 5590 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDrawDistVP, id=G2gd.wxID_DRAWDISTVP) 5591 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDrawDAT, id=G2gd.wxID_DRAWDISAGLTOR) 5592 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDrawPlane, id=G2gd.wxID_DRAWPLANE) 5593 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRBOND) 5594 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRANGLE) 5595 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRPLANE) 5596 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRestraint, id=G2gd.wxID_DRAWRESTRCHIRAL) 5597 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineRB, id=G2gd.wxID_DRAWDEFINERB) 5598 # RB Models 5599 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.RigidBodiesMenu) 5600 G2frame.dataFrame.Bind(wx.EVT_MENU, OnAutoFindResRB, id=G2gd.wxID_AUTOFINDRESRB) 5601 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBAssign, id=G2gd.wxID_ASSIGNATMS2RB) 5602 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBCopyParms, id=G2gd.wxID_COPYRBPARMS) 5603 G2frame.dataFrame.Bind(wx.EVT_MENU, OnGlobalResRBTherm, id=G2gd.wxID_GLOBALTHERM) 5604 G2frame.dataFrame.Bind(wx.EVT_MENU, OnGlobalResRBRef, id=G2gd.wxID_GLOBALRESREFINE) 5605 G2frame.dataFrame.Bind(wx.EVT_MENU, OnRBRemoveAll, id=G2gd.wxID_RBREMOVEALL) 5606 # Map peaks 5607 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.MapPeaksMenu) 5608 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksMove, id=G2gd.wxID_PEAKSMOVE) 5609 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksViewPoint, id=G2gd.wxID_PEAKSVIEWPT) 5610 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksDistVP, id=G2gd.wxID_PEAKSDISTVP) 5611 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksDA, id=G2gd.wxID_PEAKSDA) 5612 G2frame.dataFrame.Bind(wx.EVT_MENU, OnShowBonds, id=G2gd.wxID_SHOWBONDS) 5613 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksEquiv, id=G2gd.wxID_FINDEQVPEAKS) 5614 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksUnique, id=G2gd.wxID_PEAKSUNIQUE) 5615 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksDelete, id=G2gd.wxID_PEAKSDELETE) 5616 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2gd.wxID_PEAKSCLEAR) 5617 # MC/SA 5618 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.MCSAMenu) 5619 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAaddAtom, id=G2gd.wxID_ADDMCSAATOM) 5620 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAaddRB, id=G2gd.wxID_ADDMCSARB) 5621 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAclear, id=G2gd.wxID_CLEARMCSARB) 5622 G2frame.dataFrame.Bind(wx.EVT_MENU, OnMCSAmove, id=G2gd.wxID_MOVEMCSA) 5623 G2frame.dataFrame.Bind(wx.EVT_MENU, OnClearResults, id=G2gd.wxID_MCSACLEARRESULTS) 5624 # Texture 5625 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.TextureMenu) 5626 #G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureRefine, id=G2gd.wxID_REFINETEXTURE) 5627 G2frame.dataFrame.Bind(wx.EVT_MENU, OnTextureClear, id=G2gd.wxID_CLEARTEXTURE) 5628 # Pawley reflections 5629 FillSelectPageMenu(TabSelectionIdDict, G2frame.dataFrame.PawleyMenu) 5630 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyLoad, id=G2gd.wxID_PAWLEYLOAD) 5631 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyEstimate, id=G2gd.wxID_PAWLEYESTIMATE) 5632 G2frame.dataFrame.Bind(wx.EVT_MENU, OnPawleyUpdate, id=G2gd.wxID_PAWLEYUPDATE) 5633 5618 5634 # UpdatePhaseData execution starts here 5619 5635 #patch … … 5680 5696 G2frame.dataFrame.AtomCompute.ISOcalc.Enable('ISODISTORT' in data) 5681 5697 G2frame.dataDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged) 5698 FillMenus() 5682 5699 if oldPage is None or oldPage == 0: 5683 5700 ChangePage(0)
Note: See TracChangeset
for help on using the changeset viewer.