diff framework/Document.h @ 54:a798f5e6fc5e

* Further naming change: Transformer -> ModelTransformer.
  The Transform class now describes a thing that can be done, and the
  ModelTransformer does it to a Model.

--- a/framework/Document.h	Mon Nov 05 15:31:06 2007 +0000
+++ b/framework/Document.h	Wed Nov 07 12:59:01 2007 +0000
@@ -17,8 +17,9 @@
 #define _DOCUMENT_H_
 
 #include "layer/LayerFactory.h"
-#include "plugin/transform/Transformer.h"
-#include "plugin/transform/PluginTransformer.h"
+#include "plugin/transform/Transform.h"
+#include "plugin/transform/PluginTransformer.h"//!!!
+#include "plugin/transform/ModelTransformer.h"
 #include "base/Command.h"
 
 #include <map>
@@ -45,7 +46,7 @@
  * regenerate it.
  * 
  *  - Any number of Model objects that were generated by a Transformer
- * such as FeatureExtractionPluginTransformer.  For these, we also
+ * such as FeatureExtractionModelTransformer.  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.
@@ -106,14 +107,14 @@
      * by a transform layer _must_ be registered with the document
      * using addDerivedModel below.
      */
-    Layer *createDerivedLayer(LayerFactory::LayerType, TransformerId);
+    Layer *createDerivedLayer(LayerFactory::LayerType, TransformId);
 
     /**
      * Create and return a suitable layer for the given transform,
      * running the transform and associating the resulting model with
      * the new layer.
      */
-    Layer *createDerivedLayer(TransformerId,
+    Layer *createDerivedLayer(TransformId,
                               Model *inputModel, 
                               const PluginTransformer::ExecutionContext &context,
                               QString configurationXml);
@@ -149,7 +150,7 @@
      * Add a derived model associated with the given transform,
      * running the transform and returning the resulting model.
      */
-    Model *addDerivedModel(TransformerId transform,
+    Model *addDerivedModel(TransformId transform,
                            Model *inputModel,
                            const PluginTransformer::ExecutionContext &context,
                            QString configurationXml);
@@ -159,7 +160,7 @@
      * is necessary to register any derived model that was not created
      * by the document using createDerivedModel or createDerivedLayer.
      */
-    void addDerivedModel(TransformerId,
+    void addDerivedModel(TransformId,
                          Model *inputModel,
                          const PluginTransformer::ExecutionContext &context,
                          Model *outputModelToAdd,
@@ -267,7 +268,7 @@
 	// transform involved but the (target) model has been modified
 	// since being generated from it.
 	const Model *source;
-	TransformerId transform;
+	TransformId transform;
         PluginTransformer::ExecutionContext context;
         QString configurationXml;