comparison data/model/DenseThreeDimensionalModel.h @ 1202:3b84f9bd0048 3.0-integration

Merge work on unified spectrogram and colour 3d plot caching renderer

 #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;
 
-    typedef std::vector<float> Column;
+    typedef ColumnOp::Column Column;
 
     /**
      * Get data from the given column of bin values.
      */
     virtual Column getColumn(int column) const = 0;