Mercurial > hg > svcore
comparison data/model/AlignmentModel.h @ 1027:ce1077bd663a cxx11
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 09 Feb 2015 10:31:07 +0000 |
| parents | 13f53ecc8bb5 |
| children | cc27f35aa75c |
comparison
equal
deleted
inserted
replaced
| 1011:dbb7f0ab011e | 1027:ce1077bd663a |
|---|---|
| 50 const Model *getAlignedModel() const; | 50 const Model *getAlignedModel() const; |
| 51 | 51 |
| 52 int toReference(int frame) const; | 52 int toReference(int frame) const; |
| 53 int fromReference(int frame) const; | 53 int fromReference(int frame) const; |
| 54 | 54 |
| 55 void setPathFrom(SparseTimeValueModel *rawpath); | |
| 55 void setPath(PathModel *path); | 56 void setPath(PathModel *path); |
| 56 | 57 |
| 57 virtual void toXml(QTextStream &stream, | 58 virtual void toXml(QTextStream &stream, |
| 58 QString indent = "", | 59 QString indent = "", |
| 59 QString extraAttributes = "") const; | 60 QString extraAttributes = "") const; |