Changeset cfc0913 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Apr 6, 2009 4:56:35 PM (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:

40f9745

Parents:

ddfcd90

Message:

working on saving page status

File:

• sansview/perspectives/fitting/fitpage.py (modified) (13 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -26 +26 @@
   
     """
-    def __init__(self,parent, page_info, name=""):
-        BasicPage.__init__(self, parent, page_info,name)
+    def __init__(self,parent, page_info):
+        BasicPage.__init__(self, parent, page_info)
         """ 
             Initialization of the Panel
         """
-        self.name= self.data.name
-        page_info.page_name= self.data.name
-       
+        self.name = self.data.name
+        
         ## fit page does not content npts txtcrtl
         self.npts=None
@@ -42 +41 @@
         
         self._fill_datainfo_sizer()
+        
         self._fill_model_sizer( self.sizer1)
+        self._on_select_model(event=None)
         self._fill_range_sizer() 
-        self.model = self.formfactorbox.GetClientData(0)()
-        self.page_info.model= self.model
-        self._on_select_model(event=None)
+        
+       
+        ## to update the panel according to the fit engine type selected
         self.Bind(EVT_FITTER_TYPE,self._on_engine_change)
     
@@ -92 +93 @@
         """
         ## save state of radiobox
-        self.page_info. save_radiobox_state( self.description_hide )
-        self.page_info. save_radiobox_state( self.description_show )
+        #self.page_info. save_radiobox_state( self.description_hide )
+        #self.page_info. save_radiobox_state( self.description_show )
         ## Show description
         if not self.description_show.GetValue():
@@ -99 +100 @@
             
         else:
-            model=self.page_info.model
+            #model=self.page_info.model
+            
             description=""
-            if model!=None:
-                description = self.page_info.model.description
+            if self.model!=None:
+                description = self.model.description
+                #description = self.page_info.model.description
             self.description = wx.StaticText( self,-1,str(description) )
             self.sizer_description.Add( self.description, 1, wx.EXPAND | wx.ALL, 10 )
@@ -410 +413 @@
         self.compute_chisqr()
         
+        
     def get_range(self):
         """
@@ -512 +516 @@
                             "Data contains smearing information %s"%msg))
             self.manager.set_smearer(smear, qmin= self.qmin_x, qmax= self.qmax_x)   
-              
+        ## save the state enable smearing
+        self.save_current_state()
   
     def compute_chisqr2D(self):
@@ -593 +598 @@
         """
         self.param_toFit=[]
+        
         if  self.parameters !=[]:
             if  self.cb1.GetValue()==True:
@@ -608 +614 @@
                     item[0].SetValue(False)
                 self.param_toFit=[]
-               
+        self.save_current_state()  
+        
                 
                 
@@ -640 +647 @@
         else:
             self.cb1.SetValue(False)
-    
+        ## save current state of the page
+        self.save_current_state()
+        
     
     def set_model_description(self,description,sizer):
@@ -669 +678 @@
      
         
-        self.page_info.save_radiobox_state( self.description_hide )
-        self.page_info.save_radiobox_state( self.description_show )
+        #self.page_info.save_radiobox_state( self.description_hide )
+        #self.page_info.save_radiobox_state( self.description_show )
         
         sizer_selection.Add( self.description_show )
@@ -700 +709 @@
         self.sizer3.Clear(True)
         self.parameters = []
+        #self.page_info.parameters=[]
         self.param_toFit=[]
         self.fittable_param=[]
@@ -823 +833 @@
                 self.parameters.append([cb,item, ctl1,
                                         text2,ctl2, ctl3, ctl4,None])
+                #self.page_info.parameters.append([cb.GetValue(),item, ctl1.GetValue(),
+                #                        text2.IsShown(),[ctl2.IsShown(),ctl2.GetValue()],
+                #[ctl3.IsShown(),ctl3.GetValue()],[ ctl4.IsShown(),ctl4.GetValue()],None])
                 
         iy+=1
@@ -855 +868 @@
         data= Data1D(x=[1,2], y=[3,4], dy=[0.1, 0,1])
     
-        from pageInfo import PageInfo
+        from fitpanel import PageInfo
         myinfo = PageInfo(self,  model, data=data )