diff 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
line wrap: on
line diff
--- a/framework/Document.cpp	Tue May 14 14:51:09 2019 +0100
+++ b/framework/Document.cpp	Wed May 15 17:52:22 2019 +0100
@@ -1138,10 +1138,11 @@
                 << rm->getAlignmentReference() << "; this will replace that)"
                 << endl;
     }
-    
-    if (!m_align->alignModel(this, m_mainModel, rm)) {
-        SVCERR << "Alignment failed: " << m_align->getError() << endl;
-        emit alignmentFailed(m_align->getError());
+
+    QString err;
+    if (!m_align->alignModel(this, m_mainModel, rm, err)) {
+        SVCERR << "Alignment failed: " << err << endl;
+        emit alignmentFailed(err);
     }
 }