comparison src/Analyser.cpp @ 199:0ba33d6c0a71

Properly rationalise the show/hide/add/remove layer logic for pitch candidates: ctrl+return maps through to a show layer command (but the layers remain in the view) while the add/remove layer flow is used for layer creation after selection and for abandoning an edit or discarding a selection.

 #include "layer/ColourDatabase.h"
 #include "layer/ColourMapper.h"
 #include "layer/LayerFactory.h"
 #include "layer/SpectrogramLayer.h"
 #include "layer/Colour3DPlotLayer.h"
+#include "layer/ShowLayerCommand.h"
 
 #include <QSettings>
 
 using std::vector;
 

 QString
 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range)
 {
     if (sel == m_reAnalysingSelection) return "";
 
-    showPitchCandidates(false);
-    m_reAnalysisCandidates.clear();
-    m_currentCandidate = -1;
+    discardPitchCandidates();
+
     m_reAnalysingSelection = sel;
 
     m_preAnalysis = Clipboard();
     Layer *myLayer = m_layers[PitchTrack];
     if (myLayer) {

 {
     if (m_candidatesVisible == shown) return;
 
     foreach (Layer *layer, m_reAnalysisCandidates) {
         if (shown) {
-            m_document->addLayerToView(m_pane, layer);
+            CommandHistory::getInstance()->addCommand
+                (new ShowLayerCommand(m_pane, layer, true,
+                                      tr("Show Pitch Candidates")));
         } else {
-            m_document->removeLayerFromView(m_pane, layer);
+            CommandHistory::getInstance()->addCommand
+                (new ShowLayerCommand(m_pane, layer, false,
+                                      tr("Hide Pitch Candidates")));
         }
     }
 
     m_candidatesVisible = shown;
 }

 Analyser::layersCreated(vector<Layer *> primary,
                         vector<Layer *> additional)
 {
     //!!! how do we know these came from the right selection? user
     //!!! might have made another one since this request was issued
+
+    CommandHistory::getInstance()->startCompoundOperation
+        (tr("Re-Analyse Selection"), true);
 
     vector<Layer *> all;
     for (int i = 0; i < (int)primary.size(); ++i) {
         all.push_back(primary[i]);
     }

             if (params) {
                 params->setPlayAudible(false);
             }
             t->setBaseColour
                 (ColourDatabase::getInstance()->getColourIndex(tr("Bright Orange")));
-            if (m_candidatesVisible) {
-                m_document->addLayerToView(m_pane, t);
-            }
+            m_document->addLayerToView(m_pane, t);
             m_reAnalysisCandidates.push_back(t);
         }
     }
+
+    if (!all.empty()) {
+        bool show = m_candidatesVisible;
+        m_candidatesVisible = !show; // to ensure the following takes effect
+        showPitchCandidates(show);
+    }
+
+    CommandHistory::getInstance()->endCompoundOperation();
 
     emit layersChanged();
 }
 
 bool

 
     pitchTrack->deleteSelection(sel);
 }
 
 void
-Analyser::clearReAnalysis(Selection sel)
-{
-    showPitchCandidates(false);
-
-    m_reAnalysisCandidates.clear();
-    m_reAnalysingSelection = Selection();
-    m_currentCandidate = -1;
+Analyser::abandonReAnalysis(Selection sel)
+{
+    discardPitchCandidates();
 
     Layer *myLayer = m_layers[PitchTrack];
     if (!myLayer) return;
     myLayer->deleteSelection(sel);
     myLayer->paste(m_pane, m_preAnalysis, 0, false);
 }    
+
+void
+Analyser::discardPitchCandidates()
+{
+    foreach (Layer *layer, m_reAnalysisCandidates) {
+        // This will cause the layer to be deleted later (ownership is
+        // transferred to the remove command)
+        m_document->removeLayerFromView(m_pane, layer);
+    }
+
+    m_reAnalysisCandidates.clear();
+    m_currentCandidate = -1;
+    m_reAnalysingSelection = Selection();
+    m_candidatesVisible = false;
+}
 
 void
 Analyser::takePitchTrackFrom(Layer *otherLayer)
 {
     Layer *myLayer = m_layers[PitchTrack];