comparison data/model/DenseThreeDimensionalModel.h @ 1365:3382d914e110

Merge from branch 3.0-integration

 #ifndef _DENSE_THREE_DIMENSIONAL_MODEL_H_
 #define _DENSE_THREE_DIMENSIONAL_MODEL_H_
 
 #include "Model.h"
 #include "TabularModel.h"
+#include "base/ColumnOp.h"
 #include "base/ZoomConstraint.h"
 #include "base/RealTime.h"
 
 #include <QMutex>
 #include <QVector>

     /**
      * Return the maximum permissible value in each bin.
      */
     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 QVector<float> Column;
+    typedef ColumnOp::Column Column;
 
     /**
      * Get data from the given column of bin values.
      */
     virtual Column getColumn(int column) const = 0;