comparison base/RangeMapper.h @ 1580:c01cbe41aeb5 fix-static-analysis

Use override throughout
author Chris Cannam
date Mon, 26 Nov 2018 13:48:45 +0000
parents bd73a689c8af
children ad5f892c0c4d
comparison
equal deleted inserted replaced
1579:232d6ddf257d 1580:c01cbe41aeb5
87 LinearRangeMapper(int minpos, int maxpos, 87 LinearRangeMapper(int minpos, int maxpos,
88 double minval, double maxval, 88 double minval, double maxval,
89 QString unit = "", bool inverted = false, 89 QString unit = "", bool inverted = false,
90 std::map<int, QString> labels = {}); 90 std::map<int, QString> labels = {});
91 91
92 virtual int getPositionForValue(double value) const; 92 int getPositionForValue(double value) const override;
93 virtual int getPositionForValueUnclamped(double value) const; 93 int getPositionForValueUnclamped(double value) const override;
94 94
95 virtual double getValueForPosition(int position) const; 95 double getValueForPosition(int position) const override;
96 virtual double getValueForPositionUnclamped(int position) const; 96 double getValueForPositionUnclamped(int position) const override;
97 97
98 virtual QString getUnit() const { return m_unit; } 98 QString getUnit() const override { return m_unit; }
99 virtual QString getLabel(int position) const; 99 QString getLabel(int position) const override;
100 100
101 protected: 101 protected:
102 int m_minpos; 102 int m_minpos;
103 int m_maxpos; 103 int m_maxpos;
104 double m_minval; 104 double m_minval;
129 129
130 static void convertMinMax(int minpos, int maxpos, 130 static void convertMinMax(int minpos, int maxpos,
131 double minval, double maxval, 131 double minval, double maxval,
132 double &minlog, double &ratio); 132 double &minlog, double &ratio);
133 133
134 virtual int getPositionForValue(double value) const; 134 int getPositionForValue(double value) const override;
135 virtual int getPositionForValueUnclamped(double value) const; 135 int getPositionForValueUnclamped(double value) const override;
136 136
137 virtual double getValueForPosition(int position) const; 137 double getValueForPosition(int position) const override;
138 virtual double getValueForPositionUnclamped(int position) const; 138 double getValueForPositionUnclamped(int position) const override;
139 139
140 virtual QString getUnit() const { return m_unit; } 140 QString getUnit() const override { return m_unit; }
141 141
142 protected: 142 protected:
143 int m_minpos; 143 int m_minpos;
144 int m_maxpos; 144 int m_maxpos;
145 double m_ratio; 145 double m_ratio;
173 * this is not the case. 173 * this is not the case.
174 */ 174 */
175 InterpolatingRangeMapper(CoordMap pointMappings, 175 InterpolatingRangeMapper(CoordMap pointMappings,
176 QString unit); 176 QString unit);
177 177
178 virtual int getPositionForValue(double value) const; 178 int getPositionForValue(double value) const override;
179 virtual int getPositionForValueUnclamped(double value) const; 179 int getPositionForValueUnclamped(double value) const override;
180 180
181 virtual double getValueForPosition(int position) const; 181 double getValueForPosition(int position) const override;
182 virtual double getValueForPositionUnclamped(int position) const; 182 double getValueForPositionUnclamped(int position) const override;
183 183
184 virtual QString getUnit() const { return m_unit; } 184 QString getUnit() const override { return m_unit; }
185 185
186 protected: 186 protected:
187 CoordMap m_mappings; 187 CoordMap m_mappings;
188 std::map<int, double> m_reverse; 188 std::map<int, double> m_reverse;
189 QString m_unit; 189 QString m_unit;
246 /** 246 /**
247 * Return the mapping type in use. 247 * Return the mapping type in use.
248 */ 248 */
249 MappingType getType() const { return m_type; } 249 MappingType getType() const { return m_type; }
250 250
251 virtual int getPositionForValue(double value) const; 251 int getPositionForValue(double value) const override;
252 virtual int getPositionForValueUnclamped(double value) const; 252 int getPositionForValueUnclamped(double value) const override;
253 253
254 virtual double getValueForPosition(int position) const; 254 double getValueForPosition(int position) const override;
255 virtual double getValueForPositionUnclamped(int position) const; 255 double getValueForPositionUnclamped(int position) const override;
256 256
257 virtual QString getUnit() const { return m_unit; } 257 QString getUnit() const override { return m_unit; }
258 258
259 protected: 259 protected:
260 MappingType m_type; 260 MappingType m_type;
261 CoordMap m_mappings; 261 CoordMap m_mappings;
262 QString m_unit; 262 QString m_unit;