Mercurial > hg > svgui
comparison layer/SpectrogramLayer.h @ 1374:631897ba9fca zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 06 Nov 2018 08:59:03 +0000 |
parents | d79e21855aef |
children | b6cca362bbf4 |
comparison
equal
deleted
inserted
replaced
1360:e848ea0850fe | 1374:631897ba9fca |
---|---|
256 int m_maxFrequency; | 256 int m_maxFrequency; |
257 int m_initialMaxFrequency; | 257 int m_initialMaxFrequency; |
258 ColourScaleType m_colourScale; | 258 ColourScaleType m_colourScale; |
259 double m_colourScaleMultiple; | 259 double m_colourScaleMultiple; |
260 int m_colourMap; | 260 int m_colourMap; |
261 bool m_colourInverted; | |
261 mutable QColor m_crosshairColour; | 262 mutable QColor m_crosshairColour; |
262 BinScale m_binScale; | 263 BinScale m_binScale; |
263 BinDisplay m_binDisplay; | 264 BinDisplay m_binDisplay; |
264 ColumnNormalization m_normalization; // of individual columns | 265 ColumnNormalization m_normalization; // of individual columns |
265 bool m_normalizeVisibleArea; | 266 bool m_normalizeVisibleArea; |