Changeset 6bbeacd4 in sasview for sansview/perspectives/fitting/simfitpage.py

Timestamp:

Feb 28, 2011 4:04:10 PM (14 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:

a07e72f

Parents:

1584fff

Message:

remove other type of data

File:

• sansview/perspectives/fitting/simfitpage.py (modified) (9 diffs)

sansview/perspectives/fitting/simfitpage.py

@@ -50 +50 @@
         ##Font size
         self.SetWindowVariant(variant = FONT_VARIANT)
-        
+        self.id = None
         self.parent = parent
         ## store page_finder
         self.page_finder = page_finder
         ## list contaning info to set constraint 
-        ## look like self.constraint_dict[page]= page 
+        ## look like self.constraint_dict[page_id]= page 
         self.constraint_dict={}
         ## item list  self.constraints_list=[combobox1, combobox2,=,textcrtl, button ]
@@ -135 +135 @@
             self._set_constraint()
         ## get the fit range of very fit problem        
-        for page, value in self.page_finder.iteritems():
-            qmin, qmax= page.get_range()
+        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
@@ -162 +162 @@
         check all models names
         """
-        self.model_toFit=[] 
-        if self.cb1.GetValue()==True:
+        self.model_toFit = [] 
+        if self.cb1.GetValue()== True:
             for item in self.model_list:
                 item[0].SetValue(True)
@@ -270 +270 @@
         for item in self.model_toFit:
             model = item[3]
-            page= item[2]
-            self.constraint_dict[page] = model
+            page_id= item[2]
+            self.constraint_dict[page_id] = model
                    
     def _display_constraint(self, event):
@@ -333 +333 @@
         btRemove.SetToolTipString("Remove constraint.")
        
-        for page,model in self.constraint_dict.iteritems():
+        for id,model in self.constraint_dict.iteritems():
             ## check if all parameters have been selected for constraint
             ## then do not allow add constraint on parameters
@@ -364 +364 @@
         hide buttons related constraint 
         """  
-        for page in  self.page_finder.iterkeys():
-            self.page_finder[page].clear_model_param()
+        for id in  self.page_finder.iterkeys():
+            self.page_finder[id].clear_model_param()
                
         self.nb_constraint =0     
@@ -539 +539 @@
                 msg+= " to set constraint! "
                 wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
-            for page , value in self.constraint_dict.iteritems():
+            for id, value in self.constraint_dict.iteritems():
                 if model == value:
                     if constraint == "":
@@ -546 +546 @@
                         wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
                         constraint = None
-                    self.page_finder[page].set_model_param(param,constraint)
+                    self.page_finder[id].set_model_param(param,constraint)
                     break
     
@@ -575 +575 @@
         sizer.Add(data_used,(iy, ix),(1,1),
                             wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
-        
-        for page, value in self.page_finder.iteritems():
+        ix += 1 
+        tab_used = wx.StaticText(self, -1, '  Fit Tab')
+        tab_used.SetBackgroundColour('grey')
+        sizer.Add(tab_used,(iy, ix),(1,1),
+                            wx.EXPAND|wx.ADJUST_MINSIZE, 0) 
+        for id, value in self.page_finder.iteritems():
             try:
                 ix = 0
                 iy += 1 
                 model = value.get_model()
-                cb = wx.CheckBox(self, -1, str(model.name))
+                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)
+                    
+                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 
-                data = value.get_fit_data()
-                data_used= wx.StaticText(self, -1, str(data.name))
-                sizer.Add(data_used,( iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                
-                self.model_list.append([cb,value,page,model])
+                self.model_list.append([cb,value,id,model])
                 
             except:
-                pass
+                raise
+                #pass
         iy += 1
         sizer.Add((20,20),( iy,ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)