comparison src/Analyser.h @ 402:a0eedd10dee3 cxx11-types

Merge from default branch

         FrequencyRange() : min(0), max(0) { }
         FrequencyRange(double min_, double max_) : min(min_), max(max_) { }
         bool isConstrained() const { return min != max; }
         double min;
         double max;
+        bool operator==(const FrequencyRange &r) {
+            return min == r.min && max == r.max;
+        }
     };
 
     /**
      * Analyse the selection and schedule asynchronous adds of
      * candidate layers for the region it contains. Returns "" on

     void initialAnalysisCompleted();
 
 protected slots:
     void layerAboutToBeDeleted(Layer *);
     void layerCompletionChanged();
+    void reAnalyseRegion(int, int, float, float);
+    void materialiseReAnalysis();
 
 protected:
     Document *m_document;
     WaveFileModel *m_fileModel;
     PaneStack *m_paneStack;

 
     mutable std::map<Component, Layer *> m_layers;
 
     Clipboard m_preAnalysis;
     Selection m_reAnalysingSelection;
+    FrequencyRange m_reAnalysingRange;
     std::vector<Layer *> m_reAnalysisCandidates;
     int m_currentCandidate;
     bool m_candidatesVisible;
     Document::LayerCreationAsyncHandle m_currentAsyncHandle;
     QMutex m_asyncMutex;