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

Merge from default branch

--- a/src/Analyser.h	Wed Mar 11 12:20:06 2015 +0000
+++ b/src/Analyser.h	Mon Mar 23 10:33:32 2015 +0000
@@ -108,6 +108,9 @@
         bool isConstrained() const { return min != max; }
         double min;
         double max;
+        bool operator==(const FrequencyRange &r) {
+            return min == r.min && max == r.max;
+        }
     };
 
     /**
@@ -215,6 +218,8 @@
 protected slots:
     void layerAboutToBeDeleted(Layer *);
     void layerCompletionChanged();
+    void reAnalyseRegion(int, int, float, float);
+    void materialiseReAnalysis();
 
 protected:
     Document *m_document;
@@ -226,6 +231,7 @@
 
     Clipboard m_preAnalysis;
     Selection m_reAnalysingSelection;
+    FrequencyRange m_reAnalysingRange;
     std::vector<Layer *> m_reAnalysisCandidates;
     int m_currentCandidate;
     bool m_candidatesVisible;