Changeset 1b07935d in sasview for sansview/perspectives/fitting/simfitpage.py

Timestamp:

Sep 8, 2008 9:10:57 AM (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:

6f4b71f

Parents:

d89f09b

Message:

creating a panel for model display

File:

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

sansview/perspectives/fitting/simfitpage.py

@@ -1 @@
-
 
 import sys,re,string, wx   
@@ -55 +54 @@
         self.model_list=[]
         self.model_toFit=[]
+        self.page_finder={}
         iy +=1
         self.sizer2.Add((20,20),(iy, ix))
@@ -64 +64 @@
         
     def onFit(self,event):
-         """ signal for fitting"""
-         if len(self.model_toFit) >0 :
-             self.set_model()
-             self.manager._on_simul_fit()
-         else:
-             wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+        """ signal for fitting"""
+        if len(self.model_toFit) >0 :
+            if len(self.params)>0:
+                self.set_model()
+            else:
+                for page in self.page_finder.iterkeys():
+                    page.set_model_parameter()
+            self.manager._on_simul_fit()
+        else:
+            wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Select at least on model to fit "))
     def set_manager(self, manager):
@@ -99 +103 @@
             @param page_finder: the dictionary containing models information
         """
+        import copy 
         self.model_list=[]
         self.model_toFit=[]
         self.sizer1.Clear(True)
+        self.page_finder=page_finder
         ix = 0
         iy = 1 
@@ -179 +185 @@
                 #print "simfitpage: list fitpanel2",list,list[0]
                 model=list[0]
-                param_list=model.model.getParamList()
+                param_list=model.getParamList()
                 #print "simfitpage: on set_model ",self.params
                 if self.params !=[]:
                     for element in self.params:
-                        if model.model.name == str(element[0]):
+                        if model.name == str(element[0]):
                             for item in param_list:
                                 if item==str(element[1]):
@@ -189 +195 @@
                                     #print "simfitpage: model name",element[0], model.name
                                     #print "simfitpage: param name ,param value",element[1],element[2]
-                                    self.manager.set_page_finder(model.model.name,element[1],\
+                                    self.manager.set_page_finder(model.name,element[1],\
                                                                  str(element[2]))
                             #print "simfitpage:on set_model page 2",model.params['A'],self.params[2]
-                
+    
                 
     def _onTextEnter(self,event):