comparison framework/Document.h @ 53:de2b3c6479c8

* Introduce new Transform class which contains data necessary to describe the
  context for a plugin -- the plugin's name and output, the step/block size
  etc (formerly spread across ExecutionContext and TransformFactory).  Other
  code hasn't been updated to use this yet.
* Rename existing Transform stuff to Transformers (because they run Transforms)

I'm still not 100% sure about this change, don't rely on it.

 
 #ifndef _DOCUMENT_H_
 #define _DOCUMENT_H_
 
 #include "layer/LayerFactory.h"
-#include "plugin/transform/Transform.h"
-#include "plugin/transform/PluginTransform.h"
+#include "plugin/transform/Transformer.h"
+#include "plugin/transform/PluginTransformer.h"
 #include "base/Command.h"
 
 #include <map>
 #include <set>
 

  * 
  *  - Any number of imported Model objects, which contain data without any
  * requirement to remember where the data came from or how to
  * regenerate it.
  * 
- *  - Any number of Model objects that were generated by a Transform
- * such as FeatureExtractionPluginTransform.  For these, we also
+ *  - Any number of Model objects that were generated by a Transformer
+ * such as FeatureExtractionPluginTransformer.  For these, we also
  * record the source model and the name of the transform used to
  * generate the model so that we can regenerate it (potentially
  * from a different source) on demand.
  *
  *  - A flat list of Layer objects.  Elsewhere, the GUI may distribute these

      * transform itself, nor create a model.  The caller can safely
      * add a model to the layer later, but note that all models used
      * by a transform layer _must_ be registered with the document
      * using addDerivedModel below.
      */
-    Layer *createDerivedLayer(LayerFactory::LayerType, TransformId);
+    Layer *createDerivedLayer(LayerFactory::LayerType, TransformerId);
 
     /**
      * Create and return a suitable layer for the given transform,
      * running the transform and associating the resulting model with
      * the new layer.
      */
-    Layer *createDerivedLayer(TransformId,
+    Layer *createDerivedLayer(TransformerId,
                               Model *inputModel, 
-                              const PluginTransform::ExecutionContext &context,
+                              const PluginTransformer::ExecutionContext &context,
                               QString configurationXml);
 
     /**
      * Delete the given layer, and also its associated model if no
      * longer used by any other layer.  In general, this should be the

     /**
      * Get the main model (the source for playback sample rate, etc).
      */
     const WaveFileModel *getMainModel() const { return m_mainModel; }
 
-    std::vector<Model *> getTransformInputModels();
+    std::vector<Model *> getTransformerInputModels();
 
     /**
      * Add a derived model associated with the given transform,
      * running the transform and returning the resulting model.
      */
-    Model *addDerivedModel(TransformId transform,
+    Model *addDerivedModel(TransformerId transform,
                            Model *inputModel,
-                           const PluginTransform::ExecutionContext &context,
+                           const PluginTransformer::ExecutionContext &context,
                            QString configurationXml);
 
     /**
      * Add a derived model associated with the given transform.  This
      * is necessary to register any derived model that was not created
      * by the document using createDerivedModel or createDerivedLayer.
      */
-    void addDerivedModel(TransformId,
+    void addDerivedModel(TransformerId,
                          Model *inputModel,
-                         const PluginTransform::ExecutionContext &context,
+                         const PluginTransformer::ExecutionContext &context,
                          Model *outputModelToAdd,
                          QString configurationXml);
 
     /**
      * Add an imported (non-derived, non-main) model.  This is

 	// and the transform name will be set appropriately.  If the
 	// transform name is set but source is NULL, then there was a
 	// transform involved but the (target) model has been modified
 	// since being generated from it.
 	const Model *source;
-	TransformId transform;
-        PluginTransform::ExecutionContext context;
+	TransformerId transform;
+        PluginTransformer::ExecutionContext context;
         QString configurationXml;
 
 	// Count of the number of layers using this model.
 	int refcount;
     };