Changeset 05efe88 in sasview for fittingview/src/sans/perspectives/fitting

Timestamp:

Sep 23, 2011 5:34:53 PM (13 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:

71fa9028

Parents:

4c2c93f

Message:

make sure empty page get the batch flag when adding data to them

File:

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

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

@@ -200 +200 @@
         self.opened_pages = {}  
          
+        
     def set_state(self, state):
         """
@@ -439 +440 @@
         caption = "BatchPage" + str(self.batch_page_index)
         self.SetPageText(pos, caption)
+        page.batch_on = self.batch_on
         page.window_caption = caption
         page.window_name = caption
@@ -478 +480 @@
                 if (data.__class__.__name__ == "Data2D" and enable2D)\
                 or (data.__class__.__name__ == "Data1D" and not enable2D):
+                    page.batch_on = self.batch_on
                     page.fill_data_combobox(data_list)
+                    caption = "FitPage" + str(self.fit_page_index)
+                    self.SetPageText(pos, caption)
                     self.SetSelection(pos)
                     return page