diff --git a/fluent b/fluent index c747acf..908fff0 100755 --- a/fluent +++ b/fluent @@ -16,6 +16,7 @@ import workflow import logger import plots import navigator +import go_workflow PROGRAM_NAME = 'fluent' VERSION = '0.1.0' @@ -33,7 +34,7 @@ class FluentApp: gtk.glade.set_custom_handler(self.custom_object_factory) self.widget_tree = gtk.glade.XML(GLADEFILENAME, APP) - self.workflow = workflow.EinarsWorkflow(self) + self.workflow = go_workflow.EinarsWorkflow(self) def custom_object_factory(self, glade, function_name, widget_name,\ str1, str2, int1, int2): diff --git a/system/workflow.py b/system/workflow.py index bcba4a2..6a980e0 100644 --- a/system/workflow.py +++ b/system/workflow.py @@ -62,33 +62,6 @@ class Function: def run(self, data): pass -def foo(): - print "foo" - -class EinarsWorkflow (Workflow): - - def __init__(self, app): - Workflow.__init__(self, app) - self.name = 'Einar\'s Workflow' - - load = Stage('load', 'Load Data') - load.add_function(Function('load', 'Load Microarrays')) - self.add_stage(load) - - preproc = Stage('preprocess', 'Preprocessing') - preproc.add_function(Function('rma', 'RMA')) - self.add_stage(preproc) - - go = Stage('go', 'Gene Ontology Data') - go.add_function(Function('godist', 'GO Distances')) - self.add_stage(go) - - regression = Stage('regression', 'Regression') - regression.add_function(Function('pls', 'PLS')) - self.add_stage(regression) - - logger.log('debug', '\tEinar\'s workflow is now active') - class WorkflowView (gtk.VBox): def __init__(self, wf): @@ -106,7 +79,6 @@ class WorkflowView (gtk.VBox): for fun in stage.functions: btn = gtk.Button(fun.name) btn.connect('clicked', self.button_click_handler) -# btn.connect('clicked', lambda(w): logger.log('notice', fun.name)) btn.function = fun btn_box.add(btn)