Changeset 0b6ae5f in sasview

Timestamp:

Apr 27, 2011 11:15:20 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

908b817

Parents:

a0986f6

Message:

change order of fitting menu

File:

• sansview/perspectives/fitting/fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/fitting.py

@@ -95 +95 @@
         self.state_reader = None 
         self._extensions = '.fitv'
+        self.scipy_id = wx.NewId()
+        self.park_id = wx.NewId()
+        
         self.temp_state = []
         self.state_index = 0
@@ -115 +118 @@
         #Menu for fitting
         self.menu1 = wx.Menu()
-        
-        #Set park engine
-        id3 = wx.NewId()
-        scipy_help= "Scipy Engine: Perform Simple fit. More in Help window...."
-        self.menu1.AppendCheckItem(id3, "Simple Fit  [Scipy]",scipy_help) 
-        wx.EVT_MENU(owner, id3,  self._onset_engine_scipy)
-        
-        id3 = wx.NewId()
-        park_help = "Park Engine: Perform Complex fit. More in Help window...."
-        self.menu1.AppendCheckItem(id3, "Complex Fit  [Park]",park_help) 
-        wx.EVT_MENU(owner, id3,  self._onset_engine_park)
-        
-        self.menu1.FindItemByPosition(0).Check(True)
-        self.menu1.FindItemByPosition(1).Check(False)
-            
+        id1 = wx.NewId()
+        simul_help = "Add new fit panel"
+        self.menu1.Append(id1, '&New Fit Page',simul_help)
+        wx.EVT_MENU(owner, id1, self.on_add_new_page)
         self.menu1.AppendSeparator()
         id1 = wx.NewId()
@@ -135 +127 @@
         self.menu1.Append(id1, '&Simultaneous Fit',simul_help)
         wx.EVT_MENU(owner, id1, self.on_add_sim_page)
-        
         self.menu1.AppendSeparator()
-        
-        id1 = wx.NewId()
-        simul_help = "Add new fit panel"
-        self.menu1.Append(id1, '&New Fit Page',simul_help)
-        wx.EVT_MENU(owner, id1, self.on_add_new_page)
-    
+        #Set park engine
+        
+        scipy_help= "Scipy Engine: Perform Simple fit. More in Help window...."
+        self.menu1.AppendCheckItem(self.scipy_id, "Simple Fit  [Scipy]",scipy_help) 
+        wx.EVT_MENU(owner, self.scipy_id,  self._onset_engine_scipy)
+        
+        park_help = "Park Engine: Perform Complex fit. More in Help window...."
+        self.menu1.AppendCheckItem(self.park_id, "Complex Fit  [Park]",park_help) 
+        wx.EVT_MENU(owner, self.park_id,  self._onset_engine_park)
+        
+        self.menu1.FindItemById(self.scipy_id).Check(True)
+        self.menu1.FindItemById(self.park_id).Check(False)
         #create  menubar items
         return [(self.menu1, "FitEngine")]
@@ -1069 +1066 @@
         ## change menu item state
         if engine=="park":
-            self.menu1.FindItemByPosition(0).Check(False)
-            self.menu1.FindItemByPosition(1).Check(True)
+            self.menu1.FindItemById(self.park_id).Check(True)
+            self.menu1.FindItemById(self.scipy_id).Check(False)
         else:
-            self.menu1.FindItemByPosition(0).Check(True)
-            self.menu1.FindItemByPosition(1).Check(False)
+            self.menu1.FindItemById(self.park_id).Check(False)
+            self.menu1.FindItemById(self.scipy_id).Check(True)
         ## post a message to status bar
         msg = "Engine set to: %s" % self._fit_engine