Mercurial > hg > svgui
comparison layer/Colour3DPlotLayer.h @ 1374:631897ba9fca zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 06 Nov 2018 08:59:03 +0000 |
parents | d79e21855aef |
children | a18e78b9c78b |
comparison
equal
deleted
inserted
replaced
1360:e848ea0850fe | 1374:631897ba9fca |
---|---|
158 const DenseThreeDimensionalModel *m_model; // I do not own this | 158 const DenseThreeDimensionalModel *m_model; // I do not own this |
159 | 159 |
160 ColourScaleType m_colourScale; | 160 ColourScaleType m_colourScale; |
161 bool m_colourScaleSet; | 161 bool m_colourScaleSet; |
162 int m_colourMap; | 162 int m_colourMap; |
163 bool m_colourInverted; | |
163 float m_gain; | 164 float m_gain; |
164 BinScale m_binScale; | 165 BinScale m_binScale; |
165 ColumnNormalization m_normalization; // of individual columns | 166 ColumnNormalization m_normalization; // of individual columns |
166 bool m_normalizeVisibleArea; | 167 bool m_normalizeVisibleArea; |
167 bool m_invertVertical; | 168 bool m_invertVertical; |