Changeset 1545 for trunk/GSASIIgrid.py

Timestamp:

Oct 27, 2014 2:06:37 PM (8 years ago)

Author:

toby

Message:

fix tab selection (again); clean up some menus

File:

• trunk/GSASIIgrid.py (modified) (5 diffs)

trunk/GSASIIgrid.py

@@ -134 +134 @@
 [ wxID_RIGIDBODYADD,wxID_DRAWDEFINERB,wxID_RIGIDBODYIMPORT,wxID_RESIDUETORSSEQ,
     wxID_AUTOFINDRESRB,wxID_GLOBALRESREFINE,wxID_RBREMOVEALL,wxID_COPYRBPARMS,
-    wxID_GLOBALTHERM,
-] = [wx.NewId() for item in range(9)]
+    wxID_GLOBALTHERM,wxID_VECTORBODYADD
+] = [wx.NewId() for item in range(10)]
 
 [ wxID_RENAMESEQSEL,wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_PLOTSEQSEL,
@@ -3123 +3123 @@
         self.ConstraintEdit.Append(id=wxID_FUNCTADD, kind=wx.ITEM_NORMAL,text='Add New Var',
             help='Add variable composed of existing parameter')
+        self.PostfillDataMenu()
 
         # 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())
 
-        self.PostfillDataMenu()
-        
         # Rigid bodies
-        self.VectorRBEdit = wx.Menu(title='')
-        self.VectorRBEdit.Append(id=wxID_RIGIDBODYADD, kind=wx.ITEM_NORMAL,text='Add rigid body',
-            help='Add vector rigid body')
+        self.RigidBodyMenu = wx.MenuBar()
+        self.PrefillDataMenu(self.RigidBodyMenu,helpType='Rigid bodies')
         self.ResidueRBMenu = wx.Menu(title='')
         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',
             help='Import residue rigid bodies from macro file')
-            
-        self.RigidBodyMenu = wx.MenuBar()
-        self.PrefillDataMenu(self.RigidBodyMenu,helpType='Rigid bodies')
-        self.RigidBodyMenu.Append(menu=self.VectorRBEdit, title='Edit')        
+        self.RigidBodyMenu.Append(menu=self.ResidueRBMenu, title='Edit Body')
         self.PostfillDataMenu()
-            
+
+        self.VectorBodyMenu = wx.MenuBar()
+        self.PrefillDataMenu(self.VectorBodyMenu,helpType='Vector rigid bodies')
+        self.VectorRBEdit = wx.Menu(title='')
+        self.VectorRBEdit.Append(id=wxID_VECTORBODYADD, kind=wx.ITEM_NORMAL,text='Add rigid body',
+            help='Add vector rigid body')
+        self.VectorBodyMenu.Append(menu=self.VectorRBEdit, title='Edit Vector Body')
+        self.PostfillDataMenu()
+
+                    
         # Restraints
         self.RestraintTab = wx.Menu(title='')
@@ -3696 +3700 @@
 #        self.TextureEdit.Append(id=wxID_REFINETEXTURE, kind=wx.ITEM_NORMAL,text='Refine texture', 
 #            help='Refine the texture coefficients from sequential Pawley results')
+# N.B. Binding is now commented out
         self.TextureEdit.Append(id=wxID_CLEARTEXTURE, kind=wx.ITEM_NORMAL,text='Clear texture', 
             help='Clear the texture coefficients' )