Changeset 76dab10 in sasview

Timestamp:

Mar 5, 2009 10:48:08 PM (15 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:

a38c284

Parents:

1fbb343

Message:

sansview: changed my mind. The fix would have created problems when multiple fit panels are instantiated at the same time. Other considerations apply too.

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (1 diff)
• modelpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -36 +36 @@
             Initialization of the Panel
         """
+        #TODO: remove this once the inheritence is cleaned up
+        ## Data member to store the dispersion object created
+        self._disp_obj_dict = {}
+
         #Data used for fitting 
         self.data = data

sansview/perspectives/fitting/modelpage.py

@@ -29 +29 @@
     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)
@@ -40 +37 @@
         self.model=model
         
+        ## Data member to store the dispersion object created
+        self._disp_obj_dict = {}
+
         #list of dispersion paramaters
         self.disp_list=[]