Mercurial > hg > svgui
comparison layer/SliceLayer.h @ 1374:631897ba9fca zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 06 Nov 2018 08:59:03 +0000 |
parents | d79e21855aef |
children | 86f319dd6ab9 |
comparison
equal
deleted
inserted
replaced
1360:e848ea0850fe | 1374:631897ba9fca |
---|---|
140 | 140 |
141 virtual int getDefaultColourHint(bool dark, bool &impose); | 141 virtual int getDefaultColourHint(bool dark, bool &impose); |
142 | 142 |
143 const DenseThreeDimensionalModel *m_sliceableModel; | 143 const DenseThreeDimensionalModel *m_sliceableModel; |
144 int m_colourMap; | 144 int m_colourMap; |
145 bool m_colourInverted; | |
145 EnergyScale m_energyScale; | 146 EnergyScale m_energyScale; |
146 SamplingMode m_samplingMode; | 147 SamplingMode m_samplingMode; |
147 PlotStyle m_plotStyle; | 148 PlotStyle m_plotStyle; |
148 BinScale m_binScale; | 149 BinScale m_binScale; |
149 bool m_normalize; | 150 bool m_normalize; |