Changeset bb9f322 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 30, 2011 10:57:16 AM (14 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:

cd0d039

Parents:

b7e6bd3

Message:

make the model manager a singleton

Location:

sansview/perspectives/fitting

Files:

• fitting.py (modified) (2 diffs)
• models.py (modified) (4 diffs)

sansview/perspectives/fitting/fitting.py

@@ -59 +59 @@
     def __init__(self, standalone=False):
         PluginBase.__init__(self, name="Fitting", standalone=standalone)
-        
-        #Provide list of models existing in the application
-        self.menu_mng = models.ModelManager()
         
         #list of panel to send to guiframe
@@ -143 +140 @@
         self.menu1.Append(id1, '&Create New Page',simul_help)
         wx.EVT_MENU(owner, id1, self.on_add_new_page)
-        
-        #self.fit_panel.set_model_list(self.menu_mng.get_model_list())
-   
+    
         #create  menubar items
         return [(self.menu1, "FitEngine")]

sansview/perspectives/fitting/models.py

@@ -135 +135 @@
         return self.mydict
         
-class ModelManager:
+class ModelManagerBase:
     """
     """
@@ -159 +159 @@
     event_owner = None
     last_time_dir_modified = 0
-    
     def __init__(self):
         """
         """
+       
         self.stored_plugins = {}
         self._getModelList()
+        
         
     def findModels(self):
@@ -416 +417 @@
         if os.path.isdir(PLUGIN_DIR):
             temp =  os.path.getmtime(PLUGIN_DIR)
+            print "update", self.last_time_dir_modified, temp
             if  self.last_time_dir_modified != temp:
                 is_modified = True
                 self.last_time_dir_modified = temp
+        
         return is_modified
     
@@ -609 +612 @@
   
         
+class ModelManager(object):
+    """
+    implement model 
+    """
+    __modelmanager = ModelManagerBase()
+    
+    def findModels(self):
+        return self.__modelmanager.findModels()
+    
+    def _getModelList(self):
+        return self.__modelmanager._getModelList()
+    
+    def is_changed(self):
+        return self.__modelmanager.is_changed()
+    
+    def update(self):
+        print "update %%%"
+        return self.__modelmanager.update()
+    
+    def populate_menu(self, modelmenu, event_owner):
+        return self.__modelmanager.populate_menu(modelmenu, event_owner)
+    
+    def _on_model(self, evt):
+        return self.__modelmanager._on_model(evt)
+    
+    def _get_multifunc_models(self):
+        return self.__modelmanager._get_multifunc_models()
+    
+    def get_model_list(self): 
+        return self.__modelmanager.get_model_list()