Changeset 934 for trunk/GSASIIgrid.py

Timestamp:

May 28, 2013 4:29:16 PM (10 years ago)

Author:

vondreele

Message:

changes for MC/SA

File:

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

trunk/GSASIIgrid.py

@@ -59 +59 @@
 [ wxID_FOURCALC, wxID_FOURSEARCH, wxID_FOURCLEAR, wxID_PEAKSMOVE, wxID_PEAKSCLEAR, 
     wxID_CHARGEFLIP, wxID_PEAKSUNIQUE, wxID_PEAKSDELETE, wxID_PEAKSDA,
-    wxID_PEAKSDISTVP, wxID_PEAKSVIEWPT, wxID_FINDEQVPEAKS,wxID_SHOWBONDS,
-] = [wx.NewId() for item in range(13)]
+    wxID_PEAKSDISTVP, wxID_PEAKSVIEWPT, wxID_FINDEQVPEAKS,wxID_SHOWBONDS,wxID_RUNMCSA,
+] = [wx.NewId() for item in range(14)]
 
 [ wxID_PWDRADD, wxID_HKLFADD,wxID_PWDANALYSIS,wxID_DATADELETE,
@@ -79 +79 @@
 [ wxID_DRAWRESTRBOND, wxID_DRAWRESTRANGLE, wxID_DRAWRESTRPLANE, wxID_DRAWRESTRCHIRAL,
 ] = [wx.NewId() for item in range(4)]
+
+[ wxID_ADDMCSAATOM,wxID_ADDMCSARB,wxID_CLEARMCSARB,
+] = [wx.NewId() for item in range(3)]
 
 [ wxID_CLEARTEXTURE,wxID_REFINETEXTURE,
@@ -1650 +1653 @@
         self.GeneralCalc.Append(help='Clear map',id=wxID_FOURCLEAR, kind=wx.ITEM_NORMAL,
             text='Clear map')
+        self.GeneralCalc.Append(help='Run Monte Carlo - Simulated Annealing',id=wxID_RUNMCSA, kind=wx.ITEM_NORMAL,
+            text='Run MC/SA')
         self.PostfillDataMenu()
         
@@ -1767 +1772 @@
         self.DrawAtomRigidBody.Append(id=wxID_DRAWDEFINERB, kind=wx.ITEM_NORMAL,text='Define rigid body',
             help='Define rigid body with selected atoms')
+        self.PostfillDataMenu()
+
+        # Phase / MCSA tab
+        self.MCSAMenu = wx.MenuBar()
+        self.PrefillDataMenu(self.MCSAMenu,helpType='MC/SA')
+        self.MCSAEdit = wx.Menu(title='')
+        self.MCSAMenu.Append(menu=self.MCSAEdit, title='MC/SA')
+        self.MCSAEdit.Append(id=wxID_ADDMCSAATOM, kind=wx.ITEM_NORMAL,text='Add atom', 
+            help='Add single atom to MC/SA model')
+        self.MCSAEdit.Append(id=wxID_ADDMCSARB, kind=wx.ITEM_NORMAL,text='Add rigid body', 
+            help='Add rigid body to MC/SA model' )
+        self.MCSAEdit.Append(id=wxID_CLEARMCSARB, kind=wx.ITEM_NORMAL,text='Clear rigid bodies', 
+            help='Clear all rigid bodies from MC/SA model' )
         self.PostfillDataMenu()