comparison layer/RegionLayer.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
11 published by the Free Software Foundation; either version 2 of the 11 published by the Free Software Foundation; either version 2 of the
12 License, or (at your option) any later version. See the file 12 License, or (at your option) any later version. See the file
13 COPYING included with this distribution for more information. 13 COPYING included with this distribution for more information.
14 */ 14 */
15 15
16 #ifndef _REGION_LAYER_H_ 16 #ifndef SV_REGION_LAYER_H
17 #define _REGION_LAYER_H_ 17 #define SV_REGION_LAYER_H
18 18
19 #include "SingleColourLayer.h" 19 #include "SingleColourLayer.h"
20 #include "VerticalScaleLayer.h" 20 #include "VerticalScaleLayer.h"
21 #include "ColourScaleLayer.h" 21 #include "ColourScaleLayer.h"
22 22
154 RegionModel::Point m_originalPoint; 154 RegionModel::Point m_originalPoint;
155 RegionModel::Point m_editingPoint; 155 RegionModel::Point m_editingPoint;
156 RegionModel::EditCommand *m_editingCommand; 156 RegionModel::EditCommand *m_editingCommand;
157 VerticalScale m_verticalScale; 157 VerticalScale m_verticalScale;
158 int m_colourMap; 158 int m_colourMap;
159 bool m_colourInverted;
159 PlotStyle m_plotStyle; 160 PlotStyle m_plotStyle;
160 161
161 typedef std::map<double, int> SpacingMap; 162 typedef std::map<double, int> SpacingMap;
162 163
163 // region value -> ordering 164 // region value -> ordering