Mercurial > hg > svapp
diff framework/MainWindowBase.cpp @ 763:da57ab54f0e8
Merge from branch pitch-align. Doesn't actually do pitch alignment here, but this is the groundwork.
author | Chris Cannam |
---|---|
date | Wed, 13 May 2020 14:10:47 +0100 |
parents | 3a63f1f61bd6 6429a164b7e1 |
children | 4c91c95e146a |
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp Thu Apr 30 14:48:14 2020 +0100 +++ b/framework/MainWindowBase.cpp Wed May 13 14:10:47 2020 +0100 @@ -2726,8 +2726,8 @@ this, SLOT(modelRegenerationWarning(QString, QString, QString))); connect(m_document, SIGNAL(alignmentComplete(ModelId)), this, SLOT(alignmentComplete(ModelId))); - connect(m_document, SIGNAL(alignmentFailed(QString)), - this, SLOT(alignmentFailed(QString))); + connect(m_document, SIGNAL(alignmentFailed(ModelId, QString)), + this, SLOT(alignmentFailed(ModelId, QString))); m_document->setAutoAlignment(m_viewManager->getAlignMode());