comparison data/model/AlignmentModel.h @ 1686:e73baeead27f single-point

Model deletion issues - the AlignmentModel doesn't actually need to know about the input aggregate model; the document should own it instead
author Chris Cannam
date Thu, 04 Apr 2019 11:15:43 +0100
parents 0d89abd631ac
children d08b560102a1
comparison
equal deleted inserted replaced
1685:0e9840a381b5 1686:e73baeead27f
30 Q_OBJECT 30 Q_OBJECT
31 31
32 public: 32 public:
33 AlignmentModel(Model *reference, 33 AlignmentModel(Model *reference,
34 Model *aligned, 34 Model *aligned,
35 Model *inputModel, // probably an AggregateWaveModel; may be null; I take ownership 35 SparseTimeValueModel *path);
36 SparseTimeValueModel *path); // I take ownership
37 ~AlignmentModel(); 36 ~AlignmentModel();
38 37
39 bool isOK() const override; 38 bool isOK() const override;
40 sv_frame_t getStartFrame() const override; 39 sv_frame_t getStartFrame() const override;
41 sv_frame_t getEndFrame() const override; 40 sv_frame_t getEndFrame() const override;
80 79
81 protected: 80 protected:
82 Model *m_reference; // I don't own this 81 Model *m_reference; // I don't own this
83 Model *m_aligned; // I don't own this 82 Model *m_aligned; // I don't own this
84 83
85 Model *m_inputModel; // I own this
86
87 SparseTimeValueModel *m_rawPath; // I own this 84 SparseTimeValueModel *m_rawPath; // I own this
88 mutable PathModel *m_path; // I own this 85 mutable PathModel *m_path; // I own this
89 mutable PathModel *m_reversePath; // I own this 86 mutable PathModel *m_reversePath; // I own this
90 bool m_pathBegun; 87 bool m_pathBegun;
91 bool m_pathComplete; 88 bool m_pathComplete;