Changeset b6a181b in sasview

Timestamp:

Apr 2, 2014 6:44:33 PM (10 years ago)

Author:

butler

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:

b9c8fc5

Parents:

1829835

Message:

changed "simultaneous fit" to "constrained and simultaneous fit"

Location:

src/sans/perspectives/fitting

Files:

• fitpanel.py (modified) (2 diffs)
• fitting.py (modified) (3 diffs)

src/sans/perspectives/fitting/fitpanel.py

@@ -330 +330 @@
         return self.GetPage(self.GetSelection())
     
-    def add_sim_page(self, caption="Simultaneous Fit"):
+    def add_sim_page(self, caption="Const & Simul Fit"):
         """
         Add the simultaneous fit page
@@ -336 +336 @@
         from simfitpage import SimultaneousFitPage
         page_finder = self._manager.get_page_finder()
-        if caption == "Simultaneous Fit":
+        if caption == "Const & Simul Fit":
             self.sim_page = SimultaneousFitPage(self, page_finder=page_finder,
                                                  id=-1, batch_on=False)

src/sans/perspectives/fitting/fitting.py

@@ -174 +174 @@
         self.menu1.AppendSeparator()
         self.id_simfit = wx.NewId()
-        simul_help = "Simultaneous Fit"
-        self.menu1.Append(self.id_simfit, '&Simultaneous Fit', simul_help)
+        simul_help = "Constrained or Simultaneous Fit"
+        self.menu1.Append(self.id_simfit, '&Constrained or Simultaneous Fit', simul_help)
         wx.EVT_MENU(owner, self.id_simfit, self.on_add_sim_page)
         self.sim_menu = self.menu1.FindItemById(self.id_simfit)
@@ -418 +418 @@
         """
         id = event.GetId()
-        caption = "Simultaneous Fit"
+        caption = "Const & Simul Fit"
         page = self.sim_page
         if id == self.id_batchfit:
@@ -434 +434 @@
         if page != None:
             return set_focus_page(page)
-        if caption == "Simultaneous Fit":
+        if caption == "Const & Simul Fit":
             self.sim_page = self.fit_panel.add_sim_page(caption=caption)
         else: