Removed need to provide plots with project/workflow on creation, is instead injected by project itself when added to it.

This commit is contained in:
2006-04-24 14:42:45 +00:00
parent b807f27874
commit 6c72dec7fa
4 changed files with 23 additions and 23 deletions

View File

@@ -107,7 +107,7 @@ class TestDataFunction(Function):
logger.log('notice', 'Injecting foo test data')
x = randn(20,30)
X = dataset.Dataset(x)
return [X, plots.SinePlot(None)]
return [X, plots.SinePlot()]
class DatasetLoadFunction(Function):
@@ -239,8 +239,8 @@ class PCAFunction(Function):
# cleanup
rpy.r.rm(["t", "m"])
loading_plot1 = plots.ScatterPlot(self._workflow.project,P,'ids','component','1','2')
loading_plot2 = plots.ScatterPlot(self._workflow.project,P,'ids','component','3','4')
score_plot = plots.ScatterPlot(self._workflow.project,T,'filename','component','1','2')
loading_plot1 = plots.ScatterPlot(P,'ids','component','1','2')
loading_plot2 = plots.ScatterPlot(P,'ids','component','3','4')
score_plot = plots.ScatterPlot(T,'filename','component','1','2')
return [T, P, loading_plot1, loading_plot2, score_plot]

View File

@@ -102,9 +102,9 @@ class PCAFunction(Function):
#tsq = dataset.Dataset(tsq,[singel_def,data_ids[1])
## plots
loading_plot1 = plots.ScatterPlot(self.workflow.project,P,'genes','comp','1','2')
loading_plot2 = plots.ScatterPlot(self.workflow.project,P,'genes','comp','3','4')
score_plot = plots.ScatterPlot(self.workflow.project,T,'samples','comp','1','2')
loading_plot1 = plots.ScatterPlot(P,'genes','comp','1','2')
loading_plot2 = plots.ScatterPlot(P,'genes','comp','3','4')
score_plot = plots.ScatterPlot(T,'samples','comp','1','2')
return [T,P,E,loading_plot1,loading_plot2,score_plot]