Changeset 1d2782d in sasview

Timestamp:

Mar 26, 2009 4:49:11 PM (16 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:

1f57dfd

Parents:

a911b48

Message:

working on simfitpage

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• simfitpage.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -71 +71 @@
             # remove the check box link to the model name of this page (selected_page)
             if self.sim_page !=None :
-                self.sim_page.draw_page(page_finder)
+                self.sim_page.draw_page()
             
             #Delete the page from notebook

sansview/perspectives/fitting/simfitpage.py

@@ -208 +208 @@
         self.model_toFit=[]
         self.constraints_list=[]
+        self.constraint_dict={}
+        self.nb_constraint= 0
+        
         if len(self.model_list)>0:
             for item in self.model_list:
@@ -259 +262 @@
         if len(self.model_toFit) < 2:
             return
-        for page, value in self.page_finder.iteritems():
-            model = value.get_model()
-            for item in self.model_toFit:
-                if model in item and not model in self.constraint_dict.keys():
-                    self.constraint_dict[model] = page 
+        for item in self.model_toFit:
+            model = item[3]
+            page= item[2]
+            self.constraint_dict[page] = model
                    
         
@@ -290 +292 @@
         if len(self.constraints_list)!= 0:
             nb_fit_param = 0
-            for model in self.constraint_dict.keys():
+            for model in self.constraint_dict.values():
                 nb_fit_param += len(get_fittableParam(model))
             ##Don't add anymore
@@ -323 +325 @@
        
         
-        for model, value in self.constraint_dict.iteritems():
+        for page,model in self.constraint_dict.iteritems():
             ## check if all parameters have been selected for constraint
             ## then do not allow add constraint on parameters
@@ -354 +356 @@
             hide buttons related constraint 
         """  
-        if len(self.constraints_list)>0:
-            for item in self.constraints_list:
-                model = item[0].GetClientData(item[0].GetCurrentSelection())
-                if model  in self.constraint_dict.keys():
-                    page = self.constraint_dict[model]
-                    self.page_finder[page].clear_model_param()
+        for page  in  self.page_finder.iterkeys():
+            self.page_finder[page].clear_model_param()
                
         self.nb_constraint =0