Mercurial > hg > svcore
comparison data/model/DenseThreeDimensionalModel.h @ 1187:fd40a5335968 spectrogram-minor-refactor
Pull out column ops into ColumnOp
author | Chris Cannam |
---|---|
date | Mon, 20 Jun 2016 11:30:15 +0100 |
parents | abb78e824820 |
children | 51d6551d5244 |
comparison
equal
deleted
inserted
replaced
1186:12a8daa89970 | 1187:fd40a5335968 |
---|---|
16 #ifndef _DENSE_THREE_DIMENSIONAL_MODEL_H_ | 16 #ifndef _DENSE_THREE_DIMENSIONAL_MODEL_H_ |
17 #define _DENSE_THREE_DIMENSIONAL_MODEL_H_ | 17 #define _DENSE_THREE_DIMENSIONAL_MODEL_H_ |
18 | 18 |
19 #include "Model.h" | 19 #include "Model.h" |
20 #include "TabularModel.h" | 20 #include "TabularModel.h" |
21 #include "base/ColumnOp.h" | |
21 #include "base/ZoomConstraint.h" | 22 #include "base/ZoomConstraint.h" |
22 #include "base/RealTime.h" | 23 #include "base/RealTime.h" |
23 | 24 |
24 #include <QMutex> | 25 #include <QMutex> |
25 #include <QVector> | 26 #include <QVector> |
53 /** | 54 /** |
54 * Return the maximum permissible value in each bin. | 55 * Return the maximum permissible value in each bin. |
55 */ | 56 */ |
56 virtual float getMaximumLevel() const = 0; | 57 virtual float getMaximumLevel() const = 0; |
57 | 58 |
58 typedef std::vector<float> Column; | 59 typedef ColumnOp::Column Column; |
59 | 60 |
60 /** | 61 /** |
61 * Get data from the given column of bin values. | 62 * Get data from the given column of bin values. |
62 */ | 63 */ |
63 virtual Column getColumn(int column) const = 0; | 64 virtual Column getColumn(int column) const = 0; |