diff framework/Document.h @ 270:776e1aae635a tonioni

fixed flexi note layer and propagated model selection to analyser
author gyorgyf
date Sat, 13 Apr 2013 13:39:17 +0100
parents 40a0fa9af6b4
children f3f3ca272bce
line wrap: on
line diff
--- a/framework/Document.h	Tue Mar 26 20:13:06 2013 +0000
+++ b/framework/Document.h	Sat Apr 13 13:39:17 2013 +0100
@@ -19,6 +19,7 @@
 #include "layer/LayerFactory.h"
 #include "transform/Transform.h"
 #include "transform/ModelTransformer.h"
+#include "transform/FeatureExtractionModelTransformer.h"
 #include "base/Command.h"
 
 #include <map>
@@ -124,7 +125,8 @@
      */
     Layer *createDerivedLayer(const Transform &,
                               const ModelTransformer::Input &,
-                              const LayerFactory::LayerType type);
+                              const LayerFactory::LayerType type, 
+							  const FeatureExtractionModelTransformer::PreferredOutputModel outputmodel);
 
     /**
      * Delete the given layer, and also its associated model if no
@@ -161,7 +163,8 @@
      */
     Model *addDerivedModel(const Transform &transform,
                            const ModelTransformer::Input &input,
-                           QString &returnedMessage);
+                           QString &returnedMessage,
+						   FeatureExtractionModelTransformer::PreferredOutputModel outputmodel = FeatureExtractionModelTransformer::NoteOutputModel);
 
     /**
      * Add a derived model associated with the given transform.  This