Changeset 1545 for trunk/GSASIIgrid.py


Ignore:
Timestamp:
Oct 27, 2014 2:06:37 PM (8 years ago)
Author:
toby
Message:

fix tab selection (again); clean up some menus

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r1529 r1545  
    134134[ wxID_RIGIDBODYADD,wxID_DRAWDEFINERB,wxID_RIGIDBODYIMPORT,wxID_RESIDUETORSSEQ,
    135135    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)]
    138138
    139139[ wxID_RENAMESEQSEL,wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_PLOTSEQSEL,
     
    31233123        self.ConstraintEdit.Append(id=wxID_FUNCTADD, kind=wx.ITEM_NORMAL,text='Add New Var',
    31243124            help='Add variable composed of existing parameter')
     3125        self.PostfillDataMenu()
    31253126
    31263127        # item = self.ConstraintEdit.Append(id=wx.ID_ANY,kind=wx.ITEM_NORMAL,text='Update GUI')
     
    31323133        # self.Bind(wx.EVT_MENU,UpdateGSASIIconstrGUI,id=item.GetId())
    31333134
    3134         self.PostfillDataMenu()
    3135        
    31363135        # 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')
    31403138        self.ResidueRBMenu = wx.Menu(title='')
    31413139        self.ResidueRBMenu.Append(id=wxID_RIGIDBODYIMPORT, kind=wx.ITEM_NORMAL,text='Import XYZ',
     
    31453143        self.ResidueRBMenu.Append(id=wxID_RIGIDBODYADD, kind=wx.ITEM_NORMAL,text='Import residues',
    31463144            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')
    31513146        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                   
    31533157        # Restraints
    31543158        self.RestraintTab = wx.Menu(title='')
     
    36963700#        self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture',
    36973701#            help='Refine the texture coefficients from sequential Pawley results')
     3702# N.B. Binding is now commented out
    36983703        self.TextureEdit.Append(id=wxID_CLEARTEXTURE, kind=wx.ITEM_NORMAL,text='Clear texture',
    36993704            help='Clear the texture coefficients' )
Note: See TracChangeset for help on using the changeset viewer.