Mercurial > hg > svcore
diff data/model/AlignmentModel.h @ 1738:4abc0f08adf9 by-id
More on alignment models and paths
author | Chris Cannam |
---|---|
date | Wed, 26 Jun 2019 10:21:15 +0100 |
parents | 5d631f6129fe |
children | 6d09d68165a4 |
line wrap: on
line diff
--- a/data/model/AlignmentModel.h Tue Jun 25 18:56:57 2019 +0100 +++ b/data/model/AlignmentModel.h Wed Jun 26 10:21:15 2019 +0100 @@ -17,7 +17,7 @@ #define SV_ALIGNMENT_MODEL_H #include "Model.h" -#include "PathModel.h" +#include "Path.h" #include "base/RealTime.h" #include <QString> @@ -60,7 +60,7 @@ sv_frame_t fromReference(sv_frame_t frame) const; void setPathFrom(ModelId pathSource); // a SparseTimeValueModel - void setPath(const PathModel &path); + void setPath(const Path &path); void toXml(QTextStream &stream, QString indent = "", @@ -72,12 +72,9 @@ } signals: - void modelChanged(); - void modelChangedWithin(sv_frame_t startFrame, sv_frame_t endFrame); void completionChanged(); protected slots: - void pathSourceChanged(); void pathSourceChangedWithin(sv_frame_t startFrame, sv_frame_t endFrame); void pathSourceCompletionChanged(); @@ -87,8 +84,8 @@ ModelId m_pathSource; // a SparseTimeValueModel - mutable std::unique_ptr<PathModel> m_path; - mutable std::unique_ptr<PathModel> m_reversePath; + mutable std::unique_ptr<Path> m_path; + mutable std::unique_ptr<Path> m_reversePath; bool m_pathBegun; bool m_pathComplete; QString m_error; @@ -96,7 +93,7 @@ void constructPath() const; void constructReversePath() const; - sv_frame_t align(const PathModel &path, sv_frame_t frame) const; + sv_frame_t performAlignment(const Path &path, sv_frame_t frame) const; }; #endif