comparison data/model/FFTModel.h @ 182:f75f8a1cd7b1

* Some dull work to continue unifying the fft model and editable dense 3d model
  interfaces

              size_t fftSize,
              bool polar,
              size_t fillFromColumn = 0);
     ~FFTModel();
 
-    size_t getWidth() const {
-        return m_server->getWidth() >> m_xshift;
-    }
-    size_t getHeight() const {
-        return m_server->getHeight() >> m_yshift;
-    }
     float getMagnitudeAt(size_t x, size_t y) {
         return m_server->getMagnitudeAt(x << m_xshift, y << m_yshift);
     }
     float getNormalizedMagnitudeAt(size_t x, size_t y) {
         return m_server->getNormalizedMagnitudeAt(x << m_xshift, y << m_yshift);

         return m_server->getPhaseAt(x << m_xshift, y << m_yshift);
     }
     void getValuesAt(size_t x, size_t y, float &real, float &imaginary) {
         m_server->getValuesAt(x << m_xshift, y << m_yshift, real, imaginary);
     }
-    bool isColumnReady(size_t x) {
+    bool isColumnAvailable(size_t x) const {
         return m_server->isColumnReady(x << m_xshift);
-    }
-    bool isLocalPeak(size_t x, size_t y) {
-        float mag = getMagnitudeAt(x, y);
-        if (y > 0 && mag < getMagnitudeAt(x, y - 1)) return false;
-        if (y < getHeight() - 1 && mag < getMagnitudeAt(x, y + 1)) return false;
-        return true;
-    }
-    bool isOverThreshold(size_t x, size_t y, float threshold) {
-        return getMagnitudeAt(x, y) > threshold;
     }
 
     size_t getFillExtent() const { return m_server->getFillExtent(); }
 
     // DenseThreeDimensionalModel and Model methods:
     //
+    virtual size_t getWidth() const {
+        return m_server->getWidth() >> m_xshift;
+    }
+    virtual size_t getHeight() const {
+        return m_server->getHeight() >> m_yshift;
+    }
+    virtual float getValueAt(size_t x, size_t y) const {
+        return const_cast<FFTModel *>(this)->getMagnitudeAt(x, y);
+    }
     virtual bool isOK() const {
         return m_server && m_server->getModel();
     }
     virtual size_t getStartFrame() const {
         return 0;

         return 0.f; // Can't provide
     }
     virtual float getMaximumLevel() const {
         return 1.f; // Can't provide
     }
-    virtual void getBinValues(long windowStartFrame, BinValueSet &result) const;
-    virtual float getBinValue(long windowStartFrame, size_t n) const;
+    virtual void getColumn(size_t x, Column &result) const;
     virtual QString getBinName(size_t n) const;
 
     virtual int getCompletion() const { return m_server->getFillCompletion(); }
 
     virtual Model *clone() const;