Changeset 1fbb343 in sasview

Timestamp:

Mar 5, 2009 10:26:29 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

76dab10

Parents:

07a93a1

Message:

sansview: change data member to circumvent a problem with a badly written inheritence

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (2 diffs)
• modelpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -15 +15 @@
 #TODO: FitPage1D inherits from ModelPage but doesn't call its __init__ method!
 #TODO: refactor this class to have an __init__ that deals with data only, then calls a UI builder method.
+
 class FitPage1D(ModelPage):
     """
@@ -41 +42 @@
         #fit page manager 
         self.manager = None
-        
-        
-        # Should not have to write the following line if the inheritance
-        # was coded properly...
-        #TODO: get rid of this line once the class is refactored
-        self._disp_obj_dict = {}
-        
-        
         #Store the parent of this panel parent
         # For this application fitpanel is the parent

sansview/perspectives/fitting/modelpage.py

@@ -28 +28 @@
     window_caption = "Fit Page"
     name=""
+    
+    ## Data member to store the dispersion object created
+    _disp_obj_dict = {}
+    
     def __init__(self, parent,model,name, *args, **kwargs):
         wx.ScrolledWindow.__init__(self, parent, *args, **kwargs)
@@ -35 +39 @@
         # model on which the fit would be performed
         self.model=model
-        # Data member to store the dispersion object created
-        self._disp_obj_dict = {}
+        
         #list of dispersion paramaters
         self.disp_list=[]
@@ -348 +351 @@
                 if str(v)=="MyModel":
                                 # Remove the option until the rest of the code is ready for it
-                    #self.disp_box.Insert("Select customized Model",id)
+                    self.disp_box.Insert("Select customized Model",id)
                     pass  
                 else: