# HG changeset patch
# User Chris Cannam
# Date 1552901866 0
# Node ID bbfb5a1e4b84dd99ddf5119176663535fd43c70d
# Parent  1cc9a0d4b1b693e8b22b168885bfbf3d65bfcf05
Make MagnitudeRange generic, in the form of Extents

diff -r 1cc9a0d4b1b6 -r bbfb5a1e4b84 base/Extents.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base/Extents.h	Mon Mar 18 09:37:46 2019 +0000
@@ -0,0 +1,92 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#ifndef SV_EXTENTS_H
+#define SV_EXTENTS_H
+
+#include <vector>
+
+/**
+ * Maintain a min and max value, and update them when supplied a new
+ * data point.
+ */
+template <typename T>
+class Extents
+{
+public:
+    Extents() : m_min(T()), m_max(T()) { }
+    Extents(T min, T max) : m_min(min), m_max(max) { }
+    
+    bool operator==(const Extents &r) {
+        return r.m_min == m_min && r.m_max == m_max;
+    }
+    bool operator!=(const Extents &r) {
+        return !(*this == r);
+    }
+    
+    bool isSet() const {
+        return (m_min != T() || m_max != T());
+    }
+    void set(T min, T max) {
+        m_min = min;
+        m_max = max;
+        if (m_max < m_min) m_max = m_min;
+    }
+    void reset() {
+        m_min = T();
+        m_max = T();
+    }
+
+    bool sample(T f) {
+        bool changed = false;
+        if (isSet()) {
+            if (f < m_min) { m_min = f; changed = true; }
+            if (f > m_max) { m_max = f; changed = true; }
+        } else {
+            m_max = m_min = f;
+            changed = true;
+        }
+        return changed;
+    }
+    bool sample(const std::vector<T> &ff) {
+        bool changed = false;
+        for (auto f: ff) {
+            if (sample(f)) {
+                changed = true;
+            }
+        }
+        return changed;
+    }
+    bool sample(const Extents &r) {
+        bool changed = false;
+        if (isSet()) {
+            if (r.m_min < m_min) { m_min = r.m_min; changed = true; }
+            if (r.m_max > m_max) { m_max = r.m_max; changed = true; }
+        } else {
+            m_min = r.m_min;
+            m_max = r.m_max;
+            changed = true;
+        }
+        return changed;
+    }            
+
+    T getMin() const { return m_min; }
+    T getMax() const { return m_max; }
+
+private:
+    T m_min;
+    T m_max;
+};
+
+#endif
diff -r 1cc9a0d4b1b6 -r bbfb5a1e4b84 base/MagnitudeRange.h
--- a/base/MagnitudeRange.h	Fri Mar 15 14:23:50 2019 +0000
+++ b/base/MagnitudeRange.h	Mon Mar 18 09:37:46 2019 +0000
@@ -16,68 +16,8 @@
 #ifndef MAGNITUDE_RANGE_H
 #define MAGNITUDE_RANGE_H
 
-#include <vector>
+#include "Extents.h"
 
-/**
- * Maintain a min and max value, and update them when supplied a new
- * data point.
- */
-class MagnitudeRange
-{
-public:
-    MagnitudeRange() : m_min(0), m_max(0) { }
-    MagnitudeRange(float min, float max) : m_min(min), m_max(max) { }
-    
-    bool operator==(const MagnitudeRange &r) {
-        return r.m_min == m_min && r.m_max == m_max;
-    }
-    bool operator!=(const MagnitudeRange &r) {
-        return !(*this == r);
-    }
-    
-    bool isSet() const { return (m_min != 0.f || m_max != 0.f); }
-    void set(float min, float max) {
-        m_min = min;
-        m_max = max;
-        if (m_max < m_min) m_max = m_min;
-    }
-    bool sample(float f) {
-        bool changed = false;
-        if (isSet()) {
-            if (f < m_min) { m_min = f; changed = true; }
-            if (f > m_max) { m_max = f; changed = true; }
-        } else {
-            m_max = m_min = f;
-            changed = true;
-        }
-        return changed;
-    }
-    bool sample(const std::vector<float> &ff) {
-        bool changed = false;
-        for (auto f: ff) {
-            if (sample(f)) {
-                changed = true;
-            }
-        }
-        return changed;
-    }
-    bool sample(const MagnitudeRange &r) {
-        bool changed = false;
-        if (isSet()) {
-            if (r.m_min < m_min) { m_min = r.m_min; changed = true; }
-            if (r.m_max > m_max) { m_max = r.m_max; changed = true; }
-        } else {
-            m_min = r.m_min;
-            m_max = r.m_max;
-            changed = true;
-        }
-        return changed;
-    }            
-    float getMin() const { return m_min; }
-    float getMax() const { return m_max; }
-private:
-    float m_min;
-    float m_max;
-};
+typedef Extents<float> MagnitudeRange;
 
 #endif
diff -r 1cc9a0d4b1b6 -r bbfb5a1e4b84 files.pri
--- a/files.pri	Fri Mar 15 14:23:50 2019 +0000
+++ b/files.pri	Mon Mar 18 09:37:46 2019 +0000
@@ -10,6 +10,7 @@
            base/Event.h \
            base/EventSeries.h \
            base/Exceptions.h \
+           base/Extents.h \
            base/HelperExecPath.h \
            base/HitCount.h \
            base/LogRange.h \