Changeset 0a9871c in sasview

Timestamp:

Oct 3, 2011 5:11:41 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:

d74fbff

Parents:

0d7426b

Message:

make sure simfitpage is display when batchpage is on

File:

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

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

@@ -269 +269 @@
         #--------------------------------------------------------
         boxsizer1.Add(sizer_title, flag= wx.TOP|wx.BOTTOM,border=5) 
-        boxsizer1.Add(sizer_couples, flag= wx.TOP|wx.BOTTOM,border=5)
+        boxsizer1.Add(sizer_couples, 1, flag= wx.TOP|wx.BOTTOM,border=5)
        
-        self.sizer1.Add(boxsizer1,1, wx.EXPAND | wx.ALL, 10)
+        self.sizer1.Add(boxsizer1, 1, wx.EXPAND | wx.ALL, 10)
         self.sizer1.Layout()
         #self.SetScrollbars(20,20,25,65)
         self.AdjustScrollbars()
+        self.Layout()
         
     def _store_model(self):
@@ -762 +763 @@
             try:
                 ix = 0
-                iy += 1 
                 for fitproblem in value.get_fit_problem():
-                    data = fitproblem.get_fit_data()
-                    model = fitproblem.get_model()
-                    name = '_'
-                    if model is not None:
-                        name = str(model.name)
-                    cb = wx.CheckBox(self, -1, name)
-                    cb.SetValue(False)
-                    cb.Enable(model is not None and data.is_data)
-                    sizer.Add(cb, (iy, ix), (1, 1), 
-                               wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-                    wx.EVT_CHECKBOX(self, cb.GetId(), self.check_model_name)
-                    ix += 2 
-                    type = model.__class__.__name__
-                    model_type = wx.StaticText(self, -1, str(type))
-                    sizer.Add(model_type, (iy, ix), (1, 1), 
-                              wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                    name = '-'
-                    if data is not None and data.is_data:
-                        name = str(data.name)
-                    data_used = wx.StaticText(self, -1, name)
-                    ix += 1 
-                    sizer.Add(data_used, (iy, ix), (1, 1), 
-                              wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                    ix += 1 
-                    caption = value.get_fit_tab_caption()
-                    tab_caption_used= wx.StaticText(self, -1, str(caption))
-                    sizer.Add(tab_caption_used, (iy, ix), (1, 1), 
-                              wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                    if  not self.parent.get_page_by_id(id).batch_on:
+                        iy += 1 
+                        data = fitproblem.get_fit_data()
+                        model = fitproblem.get_model()
+                        name = '_'
+                        if model is not None:
+                            name = str(model.name)
+                        cb = wx.CheckBox(self, -1, name)
+                        cb.SetValue(False)
+                        cb.Enable(model is not None and data.is_data)
+                        sizer.Add(cb, (iy, ix), (1, 1), 
+                                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                        wx.EVT_CHECKBOX(self, cb.GetId(), self.check_model_name)
+                        ix += 2 
+                        type = model.__class__.__name__
+                        model_type = wx.StaticText(self, -1, str(type))
+                        sizer.Add(model_type, (iy, ix), (1, 1), 
+                                  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                        name = '-'
+                        if data is not None and data.is_data:
+                            name = str(data.name)
+                        data_used = wx.StaticText(self, -1, name)
+                        ix += 1 
+                        sizer.Add(data_used, (iy, ix), (1, 1), 
+                                  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                        ix += 1 
+                        caption = value.get_fit_tab_caption()
+                        tab_caption_used= wx.StaticText(self, -1, str(caption))
+                        sizer.Add(tab_caption_used, (iy, ix), (1, 1), 
+                                  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                     
-                self.model_list.append([cb,value,id,model])
+                        self.model_list.append([cb,value,id,model])
                 
             except:
@@ -802 +804 @@
                   wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         sizer.Layout()    
+    
 
     def on_set_focus(self, event=None):