Changeset c647377 in sasview

Timestamp:

Aug 26, 2011 10:22:36 AM (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:

ad3fa1e

Parents:

7e7e806

Message:

modify simpage according to the new page finder

File:

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

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

@@ -137 +137 @@
         if self.show_constraint.GetValue():
             self._set_constraint()
-        ## get the fit range of very fit problem        
-        for id, value in self.page_finder.iteritems():
-            qmin, qmax= self.page_finder[id].get_range()
-            value.set_range(qmin, qmax)
         ## model was actually selected from this page to be fit
         if len(self.model_toFit) >= 1 :
@@ -146 +142 @@
             for item in self.model_list:
                 if item[0].GetValue():
-                    self.manager.schedule_for_fit( value=1, fitproblem =item[1]) 
+                    self.manager.schedule_for_fit(value=1, uid=item[2]) 
             self.manager.onFit(None)
         else:
             msg= "Select at least one model to fit "
-            wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
+            wx.PostEvent(self.parent.Parent, StatusEvent(status=msg))
            
     def set_manager(self, manager):
@@ -227 +223 @@
             for item in self.model_list:
                 item[0].SetValue(False) 
-                self.manager.schedule_for_fit( value=0,fitproblem =item[1])
+                self.manager.schedule_for_fit(value=0, uid=item[2])
                 
         self.sizer1.Clear(True)    
@@ -551 +547 @@
                         wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
                         constraint = None
-                    self.page_finder[id].set_model_param(param,constraint)
+                    for fid in self.page_finder[id].iterkeys():
+                        self.page_finder[id].set_model_param(param,
+                                                        constraint, fid=fid)
                     break
     
@@ -589 +587 @@
                 ix = 0
                 iy += 1 
-                model = value.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)
-                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)
-                data = value.get_fit_data()
-                name = '-'
-                if data is not None:
-                    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)
+                for fitproblem in value.get_fit_problem():
+                    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)
+                    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)
+                    data = fitproblem.get_fit_data()
+                    name = '-'
+                    if data is not None:
+                        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)
                     
-                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])
                 
@@ -621 +623 @@
                 #pass
         iy += 1
-        sizer.Add((20,20),( iy,ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        sizer.Add((20, 20), (iy, ix), (1, 1), 
+                  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         sizer.Layout()    
+