comparison framework/Document.h @ 520:c3648c667a0b 3.0-integration

Merge from branch "alignment-simple"

 class Layer;
 class View;
 class WaveFileModel;
 
 class AdditionalModelConverter;
+
+class Align;
 
 /**
  * A Sonic Visualiser document consists of a set of data models, and
  * also the visualisation layers used to display them.  Changes to the
  * layers and their layout need to be stored and managed in much the

     void modelGenerationWarning(QString transformName, QString message);
     void modelRegenerationFailed(QString layerName, QString transformName,
                                  QString message);
     void modelRegenerationWarning(QString layerName, QString transformName,
                                   QString message);
-    void alignmentFailed(QString transformName, QString message);
+
+    void alignmentComplete(AlignmentModel *);
+    void alignmentFailed(QString message);
 
     void activity(QString);
 
 protected:
     void releaseModel(Model *model);

 
     QString getUniqueLayerName(QString candidate);
     void writeBackwardCompatibleDerivation(QTextStream &, QString, Model *,
                                            const ModelRecord &) const;
 
-    static TransformId getAlignmentTransformName();
-    
     void toXml(QTextStream &, QString, QString, bool asTemplate) const;
     void writePlaceholderMainModel(QTextStream &, QString) const;
 
     std::vector<Layer *> createLayersForDerivedModels(std::vector<Model *>,
                                                       QStringList names);

      */
     typedef std::set<Layer *> LayerSet;
     LayerSet m_layers;
 
     bool m_autoAlignment;
+    Align *m_align;
 };
 
 #endif