Mercurial > hg > svgui
comparison layer/SpectrogramLayer.h @ 1057:218be6cf2d4f spectrogram-minor-refactor
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 13 Jun 2016 12:46:36 +0100 |
parents | 5e5873c24142 |
children | 9a13bc339fa9 |
comparison
equal
deleted
inserted
replaced
1040:25b035362c44 | 1057:218be6cf2d4f |
---|---|
355 | 355 |
356 typedef std::map<int, FFTModel *> ViewFFTMap; // key is view id | 356 typedef std::map<int, FFTModel *> ViewFFTMap; // key is view id |
357 typedef std::map<int, Dense3DModelPeakCache *> PeakCacheMap; // key is view id | 357 typedef std::map<int, Dense3DModelPeakCache *> PeakCacheMap; // key is view id |
358 mutable ViewFFTMap m_fftModels; | 358 mutable ViewFFTMap m_fftModels; |
359 mutable PeakCacheMap m_peakCaches; | 359 mutable PeakCacheMap m_peakCaches; |
360 const int m_peakCacheDivisor; | |
360 mutable Model *m_sliceableModel; | 361 mutable Model *m_sliceableModel; |
361 | 362 |
362 class MagnitudeRange { | 363 class MagnitudeRange { |
363 public: | 364 public: |
364 MagnitudeRange() : m_min(0), m_max(0) { } | 365 MagnitudeRange() : m_min(0), m_max(0) { } |