comparison framework/Document.cpp @ 778:83a7b10b7415

Merge from branch pitch-align
author Chris Cannam
date Fri, 26 Jun 2020 13:48:52 +0100
parents cf4e0f3c2406 1d6cca5a5621
children 1089d65c585d
comparison
equal deleted inserted replaced
774:7bded7599874 778:83a7b10b7415
1179 return; 1179 return;
1180 } 1180 }
1181 1181
1182 SVDEBUG << "Document::alignModel: aligning..." << endl; 1182 SVDEBUG << "Document::alignModel: aligning..." << endl;
1183 if (!rm->getAlignmentReference().isNone()) { 1183 if (!rm->getAlignmentReference().isNone()) {
1184 SVDEBUG << "(Note: model " << rm << " is currently aligned to model " 1184 SVDEBUG << "(Note: model " << modelId
1185 << " is currently aligned to model "
1185 << rm->getAlignmentReference() << "; this will replace that)" 1186 << rm->getAlignmentReference() << "; this will replace that)"
1186 << endl; 1187 << endl;
1187 } 1188 }
1188 1189
1189 m_align->scheduleAlignment(this, m_mainModel, modelId); 1190 m_align->scheduleAlignment(this, m_mainModel, modelId);