Changeset 7b1ca97 in sasview

Timestamp:

Dec 2, 2011 3:39:38 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

bc69dcc

Parents:

a613fe0

Message:

Hope it fix all simul. batch fit problems

File:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -178 +178 @@
         #combined Batch
         self.id_batchfit = wx.NewId()
-        batch_help = "Batch Fit"
+        batch_help = "Combined Batch"
         self.menu1.Append(self.id_batchfit, '&Combine Batch Fit', batch_help)
         wx.EVT_MENU(owner, self.id_batchfit,  self.on_add_sim_page)
@@ -258 +258 @@
         page = self.sim_page
         if id == self.id_batchfit:
-            caption = "Batch Fit"
+            caption = "Combined Batch"
             page = self.batch_page
             
@@ -903 +903 @@
                 #or a self.batch_page
                 if self.sim_page is not None and uid == self.sim_page.uid:
-                    batch_on = self.sim_page.uid
+                    batch_on = self.sim_page.batch_on
                 if self.batch_page is not None and uid == self.batch_page.uid:
-                    batch_on = self.batch_page.uid
+                    batch_on = self.batch_page.batch_on
             except:
-                raise
-  
+                 batch_on = False
+                 #raise
+        
         # batch fit
         if batch_on: