Mercurial > hg > svgui

comparison layer/SpectrogramLayer.h @ 1105:ea5ae9dd10ba spectrogram-minor-refactor

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert ColourScaleType into an enum class
author Chris Cannam
date Thu, 14 Jul 2016 16:52:16 +0100
parents 46cc4644206d
children 8abdefce36a6
comparison
equal deleted inserted replaced
1104:46cc4644206d 1105:ea5ae9dd10ba
141 /** 141 /**
142 * Specify the scale for sample levels. See ColourScale and 142 * Specify the scale for sample levels. See ColourScale and
143 * WaveformLayer for comparison and details of meter and dB 143 * WaveformLayer for comparison and details of meter and dB
144 * scaling. The default is LogColourScale. 144 * scaling. The default is LogColourScale.
145 */ 145 */
146 void setColourScale(ColourScale::Scale); 146 void setColourScale(ColourScaleType);
147 ColourScale::Scale getColourScale() const; 147 ColourScaleType getColourScale() const;
148 148
149 /** 149 /**
150 * Specify the scale for the y axis. 150 * Specify the scale for the y axis.
151 */ 151 */
152 void setBinScale(BinScale); 152 void setBinScale(BinScale);
248 int m_colourRotation; 248 int m_colourRotation;
249 int m_initialRotation; 249 int m_initialRotation;
250 int m_minFrequency; 250 int m_minFrequency;
251 int m_maxFrequency; 251 int m_maxFrequency;
252 int m_initialMaxFrequency; 252 int m_initialMaxFrequency;
253 ColourScale::Scale m_colourScale; 253 ColourScaleType m_colourScale;
254 int m_colourMap; 254 int m_colourMap;
255 QColor m_crosshairColour; 255 QColor m_crosshairColour;
256 BinScale m_binScale; 256 BinScale m_binScale;
257 BinDisplay m_binDisplay; 257 BinDisplay m_binDisplay;
258 ColumnNormalization m_normalization; // of individual columns 258 ColumnNormalization m_normalization; // of individual columns
260 int m_lastEmittedZoomStep; 260 int m_lastEmittedZoomStep;
261 bool m_synchronous; 261 bool m_synchronous;
262 262
263 mutable bool m_haveDetailedScale; 263 mutable bool m_haveDetailedScale;
264 264
265 static ColourScale::Scale convertToColourScale(int value); 265 static ColourScaleType convertToColourScale(int value);
266 static int convertFromColourScale(ColourScale::Scale); 266 static int convertFromColourScale(ColourScaleType);
267 static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value); 267 static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value);
268 static int convertFromColumnNorm(ColumnNormalization norm, bool visible); 268 static int convertFromColumnNorm(ColumnNormalization norm, bool visible);
269 269
270 enum { NO_VALUE = 0 }; // colour index for unused pixels 270 enum { NO_VALUE = 0 }; // colour index for unused pixels
271 271