Mercurial > hg > svapp
comparison 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 |
comparison
equal
deleted
inserted
replaced
760:3a63f1f61bd6 | 763:da57ab54f0e8 |
---|---|
2724 this, SLOT(modelGenerationFailed(QString, QString))); | 2724 this, SLOT(modelGenerationFailed(QString, QString))); |
2725 connect(m_document, SIGNAL(modelRegenerationWarning(QString, QString, QString)), | 2725 connect(m_document, SIGNAL(modelRegenerationWarning(QString, QString, QString)), |
2726 this, SLOT(modelRegenerationWarning(QString, QString, QString))); | 2726 this, SLOT(modelRegenerationWarning(QString, QString, QString))); |
2727 connect(m_document, SIGNAL(alignmentComplete(ModelId)), | 2727 connect(m_document, SIGNAL(alignmentComplete(ModelId)), |
2728 this, SLOT(alignmentComplete(ModelId))); | 2728 this, SLOT(alignmentComplete(ModelId))); |
2729 connect(m_document, SIGNAL(alignmentFailed(QString)), | 2729 connect(m_document, SIGNAL(alignmentFailed(ModelId, QString)), |
2730 this, SLOT(alignmentFailed(QString))); | 2730 this, SLOT(alignmentFailed(ModelId, QString))); |
2731 | 2731 |
2732 m_document->setAutoAlignment(m_viewManager->getAlignMode()); | 2732 m_document->setAutoAlignment(m_viewManager->getAlignMode()); |
2733 | 2733 |
2734 emit replacedDocument(); | 2734 emit replacedDocument(); |
2735 } | 2735 } |