comparison data/model/Model.cpp @ 323:a71dec01c4d3

* Some tidying up to handling of alignment; add alignment status label to pane; ensure alignment when dragging with mouse as well as when playing
author Chris Cannam
date Thu, 25 Oct 2007 14:32:23 +0000
parents 3ff8f571da09
children 1afaf98dbf11
comparison
equal deleted inserted replaced
322:7623ecfd5891 323:a71dec01c4d3
94 } 94 }
95 95
96 const Model * 96 const Model *
97 Model::getAlignmentReference() const 97 Model::getAlignmentReference() const
98 { 98 {
99 if (!m_alignment) return 0; 99 if (!m_alignment) return this;
100 return m_alignment->getReferenceModel(); 100 return m_alignment->getReferenceModel();
101 } 101 }
102 102
103 size_t 103 size_t
104 Model::alignToReference(size_t frame) const 104 Model::alignToReference(size_t frame) const
115 } 115 }
116 116
117 int 117 int
118 Model::getAlignmentCompletion() const 118 Model::getAlignmentCompletion() const
119 { 119 {
120 std::cerr << "Model::getAlignmentCompletion" << std::endl; 120 // std::cerr << "Model::getAlignmentCompletion" << std::endl;
121 if (!m_alignment) return 100; 121 if (!m_alignment) return 100;
122 int completion = 0; 122 int completion = 0;
123 (void)m_alignment->isReady(&completion); 123 (void)m_alignment->isReady(&completion);
124 std::cerr << " -> " << completion << std::endl; 124 // std::cerr << " -> " << completion << std::endl;
125 return completion; 125 return completion;
126 } 126 }
127 127
128 void 128 void
129 Model::toXml(QTextStream &stream, QString indent, 129 Model::toXml(QTextStream &stream, QString indent,