Mercurial > hg > svgui
diff layer/SpectrogramLayer.h @ 130:10eec0da9efe last-cc-copyright
* Move the current DenseThreeDimensionalModel to EditableDenseThreeDimensionalModel
(wow!), and make DTDM an abstract base
* Move FFTFuzzyAdapter to FFTModel as a new subclass of DTDM
author | Chris Cannam |
---|---|
date | Mon, 31 Jul 2006 17:05:18 +0000 |
parents | 33929e0c3c6b |
children | 9e6b3e239b9d |
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h Mon Jul 31 16:15:45 2006 +0000 +++ b/layer/SpectrogramLayer.h Mon Jul 31 17:05:18 2006 +0000 @@ -23,8 +23,7 @@ #include "base/PropertyContainer.h" #include "data/model/PowerOfSqrtTwoZoomConstraint.h" #include "data/model/DenseTimeValueModel.h" - -#include "data/fft/FFTFuzzyAdapter.h" +#include "data/model/FFTModel.h" #include <QMutex> #include <QWaitCondition> @@ -36,7 +35,7 @@ class QImage; class QPixmap; class QTimer; -class FFTFuzzyAdapter; +class FFTModel; /** @@ -322,13 +321,13 @@ size_t getZeroPadLevel(const View *v) const; size_t getFFTSize(const View *v) const; - FFTFuzzyAdapter *getFFTAdapter(const View *v) const; - void invalidateFFTAdapters(); + FFTModel *getFFTModel(const View *v) const; + void invalidateFFTModels(); - typedef std::pair<FFTFuzzyAdapter *, int> FFTFillPair; // adapter, last fill + typedef std::pair<FFTModel *, int> FFTFillPair; // model, last fill typedef std::map<const View *, FFTFillPair> ViewFFTMap; typedef std::vector<float> FloatVector; - mutable ViewFFTMap m_fftAdapters; + mutable ViewFFTMap m_fftModels; class MagnitudeRange { public: