diff src/Analyser.cpp @ 325:ef75afbe4c67

Wire up "analyse now"
author Chris Cannam
date Fri, 13 Jun 2014 14:36:30 +0100
parents 2a2fd6eb8fa8
children b176ea403ee8
line wrap: on
line diff
--- a/src/Analyser.cpp	Fri Jun 13 14:21:53 2014 +0100
+++ b/src/Analyser.cpp	Fri Jun 13 14:36:30 2014 +0100
@@ -78,6 +78,31 @@
     connect(doc, SIGNAL(layerAboutToBeDeleted(Layer *)),
             this, SLOT(layerAboutToBeDeleted(Layer *)));
 
+    return doAllAnalyses();
+}
+
+QString
+Analyser::analyseExistingFile()
+{
+    if (!m_document) return "Internal error: Analyser::analyseExistingFile() called with no document present";
+
+    if (!m_pane) return "Internal error: Analyser::analyseExistingFile() called with no pane present";
+
+    if (m_layers[PitchTrack]) {
+        m_document->removeLayerFromView(m_pane, m_layers[PitchTrack]);
+        m_layers[PitchTrack] = 0;
+    }
+    if (m_layers[Notes]) {
+        m_document->removeLayerFromView(m_pane, m_layers[Notes]);
+        m_layers[Notes] = 0;
+    }
+
+    return doAllAnalyses();
+}
+
+QString
+Analyser::doAllAnalyses()
+{
     m_reAnalysingSelection = Selection();
     m_reAnalysisCandidates.clear();
     m_currentCandidate = -1;