comparison 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.

 
 #ifndef _DOCUMENT_H_
 #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>
 #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 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.
  *
  *  - 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, 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);
 
     /**

 
     /**
      * 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);
 
     /**
      * 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(TransformerId,
+    void addDerivedModel(TransformId,
                          Model *inputModel,
                          const PluginTransformer::ExecutionContext &context,
                          Model *outputModelToAdd,
                          QString configurationXml);
 

 	// 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;
-	TransformerId transform;
+	TransformId transform;
         PluginTransformer::ExecutionContext context;
         QString configurationXml;
 
 	// Count of the number of layers using this model.
 	int refcount;