changeset 1155:546d4e417346 3.0-integration

Tidy a bit

--- a/data/model/Dense3DModelPeakCache.cpp	Fri Jan 22 13:39:45 2016 +0000
+++ b/data/model/Dense3DModelPeakCache.cpp	Fri Jan 22 17:08:02 2016 +0000
@@ -41,20 +41,6 @@
     delete m_cache;
 }
 
-bool
-Dense3DModelPeakCache::isColumnAvailable(int column) const
-{
-    if (!m_source) return false;
-    if (haveColumn(column)) return true;
-    for (int i = m_resolution; i > 0; ) {
-        --i;
-        if (!m_source->isColumnAvailable(column * m_resolution + i)) {
-            return false;
-        }
-    }
-    return true;
-}
-
 Dense3DModelPeakCache::Column
 Dense3DModelPeakCache::getColumn(int column) const
 {

--- a/data/model/Dense3DModelPeakCache.h	Fri Jan 22 13:39:45 2016 +0000
+++ b/data/model/Dense3DModelPeakCache.h	Fri Jan 22 17:08:02 2016 +0000
@@ -64,8 +64,6 @@
         return m_source->getMaximumLevel();
     }
 
-    virtual bool isColumnAvailable(int column) const;
-
     virtual Column getColumn(int column) const;
 
     virtual float getValueAt(int column, int n) const;

--- a/data/model/DenseThreeDimensionalModel.h	Fri Jan 22 13:39:45 2016 +0000
+++ b/data/model/DenseThreeDimensionalModel.h	Fri Jan 22 17:08:02 2016 +0000
@@ -55,15 +55,6 @@
      */
     virtual float getMaximumLevel() const = 0;
 
-    /**
-     * Return true if there are data available for the given column.
-     * This should return true only if getColumn(column) would not
-     * have to do any substantial work to calculate its return values.
-     * If this function returns false, it may still be possible to
-     * retrieve the column, but its values may have to be calculated.
-     */
-    virtual bool isColumnAvailable(int column) const = 0;
-
     typedef std::vector<float> Column;
 
     /**

--- a/data/model/EditableDenseThreeDimensionalModel.h	Fri Jan 22 13:39:45 2016 +0000
+++ b/data/model/EditableDenseThreeDimensionalModel.h	Fri Jan 22 17:08:02 2016 +0000
@@ -105,11 +105,6 @@
     virtual void setMaximumLevel(float sz);
 
     /**
-     * Return true if there are data available for the given column.
-     */
-    virtual bool isColumnAvailable(int x) const { return x < getWidth(); }
-
-    /**
      * Get the set of bin values at the given column.
      */
     virtual Column getColumn(int x) const;

--- a/data/model/FFTModel.cpp	Fri Jan 22 13:39:45 2016 +0000
+++ b/data/model/FFTModel.cpp	Fri Jan 22 17:08:02 2016 +0000
@@ -139,13 +139,6 @@
 }
 
 bool
-FFTModel::isColumnAvailable(int) const
-{
-    //!!!
-    return true;
-}
-
-bool
 FFTModel::getMagnitudesAt(int x, float *values, int minbin, int count) const
 {
     if (count == 0) count = getHeight();

--- a/data/model/FFTModel.h	Fri Jan 22 13:39:45 2016 +0000
+++ b/data/model/FFTModel.h	Fri Jan 22 17:08:02 2016 +0000
@@ -100,7 +100,6 @@
     float getMaximumMagnitudeAt(int x) const;
     float getPhaseAt(int x, int y) const;
     void getValuesAt(int x, int y, float &real, float &imaginary) const;
-    bool isColumnAvailable(int x) const;
     bool getMagnitudesAt(int x, float *values, int minbin = 0, int count = 0) const;
     bool getNormalizedMagnitudesAt(int x, float *values, int minbin = 0, int count = 0) const;
     bool getPhasesAt(int x, float *values, int minbin = 0, int count = 0) const;