Mercurial > hg > svgui

comparison layer/Colour3DPlotLayer.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 6d720fe1c8cc
comparison
equal deleted inserted replaced
1104:46cc4644206d 1105:ea5ae9dd10ba
88 int value) const; 88 int value) const;
89 virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const; 89 virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const;
90 virtual void setProperty(const PropertyName &, int value); 90 virtual void setProperty(const PropertyName &, int value);
91 virtual void setProperties(const QXmlAttributes &); 91 virtual void setProperties(const QXmlAttributes &);
92 92
93 void setColourScale(ColourScale::Scale); 93 void setColourScale(ColourScaleType);
94 ColourScale::Scale getColourScale() const { return m_colourScale; } 94 ColourScaleType getColourScale() const { return m_colourScale; }
95 95
96 void setColourMap(int map); 96 void setColourMap(int map);
97 int getColourMap() const; 97 int getColourMap() const;
98 98
99 /** 99 /**
161 mutable QImage *m_cache; 161 mutable QImage *m_cache;
162 mutable QImage *m_peaksCache; 162 mutable QImage *m_peaksCache;
163 mutable int m_cacheValidStart; 163 mutable int m_cacheValidStart;
164 mutable int m_cacheValidEnd; 164 mutable int m_cacheValidEnd;
165 165
166 ColourScale::Scale m_colourScale; 166 ColourScaleType m_colourScale;
167 bool m_colourScaleSet; 167 bool m_colourScaleSet;
168 int m_colourMap; 168 int m_colourMap;
169 float m_gain; 169 float m_gain;
170 BinScale m_binScale; 170 BinScale m_binScale;
171 ColumnNormalization m_normalization; // of individual columns 171 ColumnNormalization m_normalization; // of individual columns
180 int m_miny; 180 int m_miny;
181 int m_maxy; 181 int m_maxy;
182 182
183 bool m_synchronous; 183 bool m_synchronous;
184 184
185 static ColourScale::Scale convertToColourScale(int value); 185 static ColourScaleType convertToColourScale(int value);
186 static int convertFromColourScale(ColourScale::Scale); 186 static int convertFromColourScale(ColourScaleType);
187 static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value); 187 static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value);
188 static int convertFromColumnNorm(ColumnNormalization norm, bool visible); 188 static int convertFromColumnNorm(ColumnNormalization norm, bool visible);
189 189
190 mutable Dense3DModelPeakCache *m_peakCache; 190 mutable Dense3DModelPeakCache *m_peakCache;
191 const int m_peakCacheDivisor; 191 const int m_peakCacheDivisor;