Mercurial > hg > svapp
comparison framework/Document.cpp @ 670:0960e27c3232 tuning-difference
Experiment with optionally taking tuning difference into account for alignment
author | Chris Cannam |
---|---|
date | Wed, 15 May 2019 17:52:22 +0100 |
parents | 31ea416fea3c |
children | ae7584dbd668 |
comparison
equal
deleted
inserted
replaced
669:331be52cd473 | 670:0960e27c3232 |
---|---|
1136 if (rm->getAlignmentReference() != nullptr) { | 1136 if (rm->getAlignmentReference() != nullptr) { |
1137 SVDEBUG << "(Note: model " << rm << " is currently aligned to model " | 1137 SVDEBUG << "(Note: model " << rm << " is currently aligned to model " |
1138 << rm->getAlignmentReference() << "; this will replace that)" | 1138 << rm->getAlignmentReference() << "; this will replace that)" |
1139 << endl; | 1139 << endl; |
1140 } | 1140 } |
1141 | 1141 |
1142 if (!m_align->alignModel(this, m_mainModel, rm)) { | 1142 QString err; |
1143 SVCERR << "Alignment failed: " << m_align->getError() << endl; | 1143 if (!m_align->alignModel(this, m_mainModel, rm, err)) { |
1144 emit alignmentFailed(m_align->getError()); | 1144 SVCERR << "Alignment failed: " << err << endl; |
1145 emit alignmentFailed(err); | |
1145 } | 1146 } |
1146 } | 1147 } |
1147 | 1148 |
1148 void | 1149 void |
1149 Document::alignModels() | 1150 Document::alignModels() |