mainly overhaul of observers, and removal of project singleton

system/project.py

@@ -5,33 +5,35 @@ class Project:
     def __init__(self,name="Testing"):
         self.name = name
         self.dim_names = []
-        self._selection_observers = []
+        self._observers = {}
         self.current_data=None
         self.datasets=[]
         self.sel_obj = dataset.Selection()
         
-    def attach(self, observer):
+    def attach(self,observer,key):
         """Attach observer for selection updates"""
-        if not observer in self._selection_observers:
-            self._selection_observers.append(observer)
+        if not self._observers.has_key(key):
+            self._observers[key]=[]        
+        if not observer in self._observers[key]:
+            self._observers[key].append(observer)
 
-    def detach(self, observer):
+    def detach(self,observer,key):
         """Detach observer for selection updates"""
         try:
-            self.selection_observers.remove(observer)
+            self._observers[key].remove(observer)
         except ValueError:
             pass
 
-    def notify(self, modifier=None):
-        """Notifies observers that selection is updated"""
-        for observer in self._selection_observers:
+    def notify(self,key,modifier=None):
+        """Notifies observers"""
+        for observer in self._observers[key]:
             if modifier != observer:
-                observer.update_selection(self)
+                observer.update(self,key)
 
     def set_selection(self,dim_name,selection):
-        """Sets selection and notifies observers"""
+        """Sets a current selection and notify observers"""
         self.sel_obj.current_selection[dim_name] = set(selection)
-        self.notify()
+        self.notify('selection_update')
 
     def get_selection(self):
         """Returns the current selection object"""
@@ -50,18 +52,6 @@ class Project:
             dim_name = dim_name + "_t" 
         return dim_name
         
-# FIXME: Singleton project should be removed.
-c_p = Project()
-
-#add test data
-x = scipy.rand(2000,3)
-def_list = [ ['samples',[]], ['genes',['a','b','c']] ]
-test_data = dataset.Dataset(x,def_list)
-c_p.add_dataset(test_data)
-
-y = scipy.rand(2000,2)
-def_list = [ ['samples',[]], ['yclasses',['C','N']] ]
-test_data = dataset.Dataset(y,def_list)
-c_p.add_dataset(test_data)
+