Changeset f3f6746 in sasview for fittingview/src/sans

Timestamp:

Oct 21, 2011 1:23:38 PM (13 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:

054f004

Parents:

6dad639

Message:

fixed in batch new 2D set data

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitpanel.py (modified) (2 diffs)

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

@@ -1964 +1964 @@
             self.slit_smearer.Enable(False)
             self.pinhole_smearer.Enable(False)
+            self.btEditMask.Disable()  
+            self.EditMask_title.Disable()
+
         
         self.on_set_focus(None)

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

@@ -428 +428 @@
             #check if there is an empty page to fill up 
             if not check_data_validity(p.get_data()) and p.batch_on:
-                page = p
-                #self.batch_page_index += 1
-                break
+                
+                #make sure data get placed in 1D empty tab if data is 1D
+                #else data get place on 2D tab empty tab
+                enable2D = p.get_view_mode()
+                if (data.__class__.__name__ == "Data2D" and enable2D)\
+                or (data.__class__.__name__ == "Data1D" and not enable2D):
+                    page = p
+                    break
         if data_1d_list and data_2d_list:
             # need to warning the user that this batch is a special case
@@ -459 +464 @@
                 
         pos = self.GetPageIndex(page)
-        caption = "BatchPage" + str(self.batch_page_index)
-        self.SetPageText(pos, caption)
         page.batch_on = self.batch_on
         page._set_save_flag(not page.batch_on)
-        page.window_caption = caption
-        page.window_name = caption
         self.SetSelection(pos)
         self.opened_pages[page.uid] = page