comparison src/Analyser.cpp @ 341:6b57c58b88d2

Cancel async layer creation in Tony when selection is changed during it

 #include "layer/SpectrogramLayer.h"
 #include "layer/Colour3DPlotLayer.h"
 #include "layer/ShowLayerCommand.h"
 
 #include <QSettings>
+#include <QMutexLocker>
 
 using std::vector;
 
 Analyser::Analyser() :
     m_document(0),
     m_fileModel(0),
     m_paneStack(0),
     m_pane(0),
     m_currentCandidate(-1),
-    m_candidatesVisible(false)
+    m_candidatesVisible(false),
+    m_currentAsyncHandle(0)
 {
     QSettings settings;
     settings.beginGroup("LayerDefaults");
     settings.setValue
         ("timevalues",

 }
 
 QString
 Analyser::reAnalyseSelection(Selection sel, FrequencyRange range)
 {
+    QMutexLocker locker(&m_asyncMutex);
+
     if (sel == m_reAnalysingSelection || sel.isEmpty()) return "";
+
+    if (m_currentAsyncHandle) {
+        m_document->cancelAsyncLayerCreation(m_currentAsyncHandle);
+    }
 
     if (!m_reAnalysisCandidates.empty()) {
         CommandHistory::getInstance()->startCompoundOperation
             (tr("Discard Previous Candidates"), true);
         discardPitchCandidates();

     
     t.setStartTime(start);
     t.setDuration(duration);
 
     transforms.push_back(t);
-
-    m_document->createDerivedLayersAsync(transforms, m_fileModel, this);
+    
+    m_currentAsyncHandle =
+        m_document->createDerivedLayersAsync(transforms, m_fileModel, this);
 
     return "";
 }
 
 bool

 
     m_candidatesVisible = shown;
 }
 
 void
-Analyser::layersCreated(vector<Layer *> primary,
+Analyser::layersCreated(Document::LayerCreationAsyncHandle handle,
+                        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
-
-    if (m_reAnalysingSelection == Selection()) {
-        // We don't want these (actually, as above, this should check
-        // that the selection is the same as the one requested -- but
-        // all we're doing here is checking that the selection exists
-        // at all, so hasn't been cleared or the document deleted or
-        // whatever)
+    QMutexLocker locker(&m_asyncMutex);
+
+    if (handle != m_currentAsyncHandle || 
+        m_reAnalysingSelection == Selection()) {
+        // We don't want these!
         for (int i = 0; i < (int)primary.size(); ++i) {
             m_document->deleteLayer(primary[i]);
         }
         for (int i = 0; i < (int)additional.size(); ++i) {
             m_document->deleteLayer(additional[i]);
         }
         return;
     }
+    m_currentAsyncHandle = 0;
 
     CommandHistory::getInstance()->startCompoundOperation
         (tr("Re-Analyse Selection"), true);
 
     m_reAnalysisCandidates.clear();