comparison align/MATCHAligner.h @ 781:b651dc5ff555

Add subsequence option all over the place
author Chris Cannam
date Thu, 16 Jul 2020 18:01:50 +0100
parents 87d33e79855b
children
comparison
equal deleted inserted replaced
780:8fa98f89eda8 781:b651dc5ff555
26 26
27 public: 27 public:
28 MATCHAligner(Document *doc, 28 MATCHAligner(Document *doc,
29 ModelId reference, 29 ModelId reference,
30 ModelId toAlign, 30 ModelId toAlign,
31 bool subsequence,
31 bool withTuningDifference); 32 bool withTuningDifference);
32 33
33 // Destroy the aligner, cleanly cancelling any ongoing alignment 34 // Destroy the aligner, cleanly cancelling any ongoing alignment
34 ~MATCHAligner(); 35 ~MATCHAligner();
35 36
40 private slots: 41 private slots:
41 void alignmentCompletionChanged(ModelId); 42 void alignmentCompletionChanged(ModelId);
42 void tuningDifferenceCompletionChanged(ModelId); 43 void tuningDifferenceCompletionChanged(ModelId);
43 44
44 private: 45 private:
45 static QString getAlignmentTransformName(); 46 static QString getAlignmentTransformName(bool subsequence);
46 static QString getTuningDifferenceTransformName(); 47 static QString getTuningDifferenceTransformName();
47 48
48 bool beginAlignmentPhase(); 49 bool beginAlignmentPhase();
49 50
50 Document *m_document; 51 Document *m_document;
52 ModelId m_toAlign; 53 ModelId m_toAlign;
53 ModelId m_aggregateModel; // an AggregateWaveModel 54 ModelId m_aggregateModel; // an AggregateWaveModel
54 ModelId m_alignmentModel; // an AlignmentModel 55 ModelId m_alignmentModel; // an AlignmentModel
55 ModelId m_tuningDiffOutputModel; // SparseTimeValueModel, unreg'd with doc 56 ModelId m_tuningDiffOutputModel; // SparseTimeValueModel, unreg'd with doc
56 ModelId m_pathOutputModel; // SparseTimeValueModel, unreg'd with doc 57 ModelId m_pathOutputModel; // SparseTimeValueModel, unreg'd with doc
58 bool m_subsequence;
57 bool m_withTuningDifference; 59 bool m_withTuningDifference;
58 float m_tuningFrequency; 60 float m_tuningFrequency;
59 bool m_incomplete; 61 bool m_incomplete;
60 }; 62 };
61 63