Changeset b28717b in sasview

Timestamp:

Mar 26, 2009 11:18:19 AM (15 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:

8bd4dc0

Parents:

2549c1b

Message:

working on simpage

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)
• simfitpage.py (modified) (16 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -125 +125 @@
         """
         from simfitpage import SimultaneousFitPage
-        self.sim_page = SimultaneousFitPage(self, id=-1)
+        page_finder= self.manager.get_page_finder()
+        self.sim_page = SimultaneousFitPage(self,page_finder=page_finder, id=-1)
+        
         self.AddPage(self.sim_page,caption="Simultaneous Fit",select=True)
         self.sim_page.set_manager(self.manager)

sansview/perspectives/fitting/fitting.py

@@ -126 +126 @@
         
         self.sim_page= self.fit_panel.add_sim_page()
-        self.sim_page.draw_page(self.page_finder)
+        
         
         
@@ -787 +787 @@
             
             if self.sim_page!=None:
-                self.sim_page.draw_page(self.page_finder)
+                self.sim_page.draw_page()
         
         

sansview/perspectives/fitting/simfitpage.py

@@ -48 +48 @@
         self.parent = parent
         ## store page_finder
-        self.page_finder=page_finder
+        self.page_finder = page_finder
         ## list contaning info to set constraint 
         ## look like self.constraint_dict[page]=FitConstraint(model, page)
@@ -58 +58 @@
         ## selected mdoel to fit
         self.model_toFit=[]
-        ## draw
+        ## number of constraint
+        self.nb_constraint= 0
+        ## draw page
         self.define_page_structure()
-        self.draw_page(self.page_finder)
-        
+        self.draw_page()
         self.set_layout()
         
@@ -117 +118 @@
         """
         self.manager = manager
-        self.draw_page( self.manager.page_finder)
-        
+       
         
     def check_all_model_name(self,event):
@@ -135 +135 @@
             ## display constraint fields
             if self.show_constraint.GetValue():
-                self._hide_constraint()
                 self._show_constraint()
                 return
@@ -162 +161 @@
                     self.model_toFit.remove(item)
                     self.cb1.SetValue(False)
+        
         ## display constraint fields
-        if len(self.model_toFit)>=2 and len(self.model_list)==len(self.model_toFit):
+        if len(self.model_toFit)==2:
             self._store_model()
-            if self.show_constraint.GetValue():
-                self._hide_constraint()
+            if self.show_constraint.GetValue() and len(self.constraints_list)==0:
                 self._show_constraint()
-                          
+        elif len(self.model_toFit)< 2:
+            ##constraint info
+            self._hide_constraint()              
        
         ## set the value of the main check button          
         if len(self.model_list)==len(self.model_toFit):
             self.cb1.SetValue(True)
-            ## constraint info
-            self._store_model()
-            ## display constraint fields
-            if self.show_constraint.GetValue():
-                self._hide_constraint()
-                self._show_constraint()
-                return
+            return
         else:
             self.cb1.SetValue(False)
-            if len(self.model_toFit)>=2:
-                self._store_model()
-                if self.show_constraint.GetValue():
-                    self._show_constraint()
-                    return
-            ##constraint info
-            self._hide_constraint()
+           
         
   
-    def draw_page(self, page_finder={}):      
+    def draw_page(self):      
         """
             Draw a sizer containing couples of data and model 
-        """   
-        ## receive a new page_finder  
-        self.page_finder = page_finder  
-       
+        """ 
+      
         self.model_list=[]
         self.model_toFit=[]
@@ -266 +253 @@
             return
         if self.show_constraint.GetValue():
-            self._hide_constraint()
             self._show_constraint()
             return
@@ -287 +273 @@
                 msg += "Parameters name reached %s"%str(nb_fit_param)
                 wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
-                self.sizer_couples.Layout()
+                self.sizer_constraints.Layout()
                 self.sizer2.Layout()
                 self.SetScrollbars(20,20,200,100)
@@ -295 +281 @@
             msg= "Select at least 2 model to add constraint "
             wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
-            self.sizer_couples.Layout()
+            self.sizer_constraints.Layout()
             self.sizer2.Layout()
             self.SetScrollbars(20,20,200,100)
@@ -306 +292 @@
 
         param_cbox = wx.ComboBox(self, -1)
+        param_cbox.Hide()
         wx.EVT_COMBOBOX(param_cbox,-1, self._on_select_param)
         
@@ -325 +312 @@
         self.constraints_list.append([model_cbox, param_cbox, egal_txt, ctl2])
         
-        sizer_constraint.Add(model_cbox)
-        sizer_constraint.Add((10,10))
-        sizer_constraint.Add(param_cbox)
-        sizer_constraint.Add(egal_txt)
-        sizer_constraint.Add(ctl2)
-        sizer_constraint.Add((10,10))
-        
-        
-        self.sizer_couples.Add(sizer_constraint)
-        self.sizer_couples.Add((10,10))
-        self.sizer_couples.Layout()
+        sizer_constraint.Add(model_cbox, flag= wx.RIGHT|wx.EXPAND,border=10)
+        sizer_constraint.Add(param_cbox, flag= wx.RIGHT|wx.EXPAND,border=5)
+        sizer_constraint.Add(egal_txt, flag= wx.RIGHT|wx.EXPAND,border=5)
+        sizer_constraint.Add(ctl2, flag= wx.RIGHT|wx.EXPAND,border=10)
+      
+        self.sizer_constraints.Insert(before=self.nb_constraint,
+                                      item=sizer_constraint, flag= wx.TOP|wx.BOTTOM|wx.EXPAND,
+                                   border=5, userData=0)
+       
+        self.nb_constraint += 1
+        self.sizer_constraints.Layout()
         self.sizer2.Layout()
         self.SetScrollbars(20,20,200,100)
@@ -345 +332 @@
         if len(self.constraint_dict)>0:
             for item in self.constraints_list:
-                model = item[0].GetClientData(0)
+                model = item[0].GetClientData(item[0].GetCurrentSelection())
                 if model  in self.constraint_dict.keys():
                     page = self.constraint_dict[model].page
                     self.page_finder[page].clear_model_param()
-                    
+               
+        self.nb_constraint =0     
         self.constraint_dict={}
         self._store_model()
-        self.btAdd.Hide()
+      
         self.constraints_list=[]         
-        self.sizer_couples.Clear(True) 
-        self.sizer_couples.Layout()    
+        self.sizer_constraints.Clear(True) 
+        self.sizer_constraints.Layout()    
         self.sizer2.Layout()
         self.SetScrollbars(20,20,200,100)
@@ -401 +389 @@
         ctl2.Show(True)
         
-        self.btAdd.Show(True)
+        
         self.sizer2.Layout()
         self.SetScrollbars(20,20,200,100)
@@ -428 +416 @@
             ctl2 = item[3]
             if ctl2.GetValue().lstrip().rstrip()=="":
-                 msg= " Enter a constraint for %s.%s! "%(param_cbox.GetClientData(0).name,
-                                              param_cbox.GetString(0))           
-                 wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
-                 return 
+                model= param_cbox.GetClientData(param_cbox.GetCurrentSelection())
+                msg= " Enter a constraint for %s.%s! "%(model.name,param_cbox.GetString(0))           
+                wx.PostEvent(self.parent.Parent, StatusEvent(status= msg ))
+                return 
        
         ## some model or parameters can be constrained
@@ -452 +440 @@
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         sizer_title = wx.BoxSizer(wx.HORIZONTAL)
-        self.sizer_couples = wx.BoxSizer(wx.VERTICAL)
+        self.sizer_constraints = wx.BoxSizer(wx.VERTICAL)
         sizer_button = wx.BoxSizer(wx.HORIZONTAL)
         
@@ -477 +465 @@
         self.btAdd.Bind(wx.EVT_BUTTON, self._onAdd_constraint,id= self.btAdd.GetId())
         self.btAdd.SetToolTipString("Add another constraint?")
-        self.btAdd.Hide()
+       
         
         self.btFit = wx.Button(self,wx.NewId(),'Fit')
@@ -490 +478 @@
         boxsizer1.Add(sizer_title)
         boxsizer1.Add((10,10))
-        boxsizer1.Add(self.sizer_couples)
+        boxsizer1.Add(self.sizer_constraints)
         boxsizer1.Add((10,10))
         boxsizer1.Add(sizer_button)