Changeset cfc0913 in sasview for sansview/perspectives/fitting/modelpage.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/modelpage.py (modified) (7 diffs)

sansview/perspectives/fitting/modelpage.py

@@ -25 +25 @@
     """
     def __init__(self,parent, page_info, name=""):
-        BasicPage.__init__(self, parent, page_info,name)
+        BasicPage.__init__(self, parent, page_info)
         """ 
             Initialization of the Panel
@@ -33 +33 @@
         self._fill_model_sizer( self.sizer1)  
         self._fill_range_sizer() 
-        if hasattr(self.page_info,"model"):
-            model=self.page_info.model
-            description=""
-            if model!=None:
-                description = self.page_info.model.description
+       
+        description=""
+        if self.model!=None:
+            #description = self.page_info.model.description
+            description = self.model.description
             self.set_model_param_sizer(self.model)
             self.set_model_description(description,self.sizer2)
@@ -59 +59 @@
         """
         ## 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():
@@ -66 +66 @@
             
         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.page_info.model.description
+                description = self.model.description
             self.description = wx.StaticText( self,-1,str(description) )
             self.sizer_description.Add( self.description, 1, wx.EXPAND | wx.ALL, 10 )
@@ -93 +94 @@
         sizer_npts.Add(self.npts,1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5) 
         self._set_range_sizer( title="Plotted Q Range", object= sizer_npts)
+       
        
     def _on_select_model(self, event): 
@@ -291 +293 @@
         self.model_description.SetToolTipString("See more description in help menu.")
         
-        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 )
@@ -435 +437 @@
         #from sans.models.LineModel import LineModel
         #model = LineModel()
-        from pageInfo import PageInfo
+        from fitpanel import PageInfo
         myinfo = PageInfo(self,model)
         from models import ModelList