mainly overhaul of observers, and removal of project singleton
This commit is contained in:
21
fluent
21
fluent
@@ -14,10 +14,12 @@ import gnome.ui
|
||||
import pango
|
||||
import project
|
||||
import workflow
|
||||
import dataset
|
||||
import logger
|
||||
import plots
|
||||
import navigator
|
||||
import go_workflow
|
||||
import scipy
|
||||
|
||||
PROGRAM_NAME = 'fluent'
|
||||
VERSION = '0.1.0'
|
||||
@@ -29,11 +31,22 @@ class FluentApp:
|
||||
|
||||
def __init__(self):
|
||||
# Application variables
|
||||
self.navigator = navigator.NavigatorStore()
|
||||
self.current_data = None
|
||||
|
||||
self.project = project.Project()
|
||||
|
||||
# add test data ##################
|
||||
x = scipy.rand(200,3)
|
||||
def_list = [ ['samples',[]], ['genes',['a','b','c']] ]
|
||||
test_data1 = dataset.Dataset(x,def_list)
|
||||
self.project.add_dataset(test_data1)
|
||||
#y = scipy.rand(200,2)
|
||||
#def_list = [ ['samples',[]], ['yclasses',['C','N']] ]
|
||||
#test_data2 = dataset.Dataset(y,def_list)
|
||||
|
||||
####################
|
||||
|
||||
|
||||
self.navigator = navigator.NavigatorStore(self.project)
|
||||
self.current_data = None
|
||||
gtk.glade.set_custom_handler(self.custom_object_factory)
|
||||
self.widget_tree = gtk.glade.XML(GLADEFILENAME, 'appwindow')
|
||||
self.workflow = go_workflow.EinarsWorkflow(self)
|
||||
@@ -59,7 +72,7 @@ class FluentApp:
|
||||
self.small_view.show()
|
||||
return self.small_view
|
||||
|
||||
def create_large_view(self, str1, str2, int1, int2):
|
||||
def create_large_view(self, str1, str2, int1, int2,project):
|
||||
self.large_view = plots.LargeView()
|
||||
self.large_view.show()
|
||||
return self.large_view
|
||||
|
Reference in New Issue
Block a user