Mercurial > hg > svgui

comparison layer/SingleColourLayer.cpp @ 1216:dc2af6616c83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:50 +0000
parents a5488775f880
children a34a2a25907c
comparison
equal deleted inserted replaced
1048:e8102ff5573b 1216:dc2af6616c83
135 setBaseColour(value); 135 setBaseColour(value);
136 } 136 }
137 } 137 }
138 138
139 void 139 void
140 SingleColourLayer::setDefaultColourFor(View *v) 140 SingleColourLayer::setDefaultColourFor(LayerGeometryProvider *v)
141 { 141 {
142 #ifdef DEBUG_COLOUR_SELECTION 142 #ifdef DEBUG_COLOUR_SELECTION
143 SVDEBUG << "SingleColourLayer::setDefaultColourFor: m_colourExplicitlySet = " << m_colourExplicitlySet << ", m_defaultColourSet " << m_defaultColourSet << endl; 143 SVDEBUG << "SingleColourLayer::setDefaultColourFor: m_colourExplicitlySet = " << m_colourExplicitlySet << ", m_defaultColourSet " << m_defaultColourSet << endl;
144 #endif 144 #endif
145 145
242 { 242 {
243 return ColourDatabase::getInstance()->getColour(m_colour); 243 return ColourDatabase::getInstance()->getColour(m_colour);
244 } 244 }
245 245
246 QColor 246 QColor
247 SingleColourLayer::getBackgroundQColor(View *v) const 247 SingleColourLayer::getBackgroundQColor(LayerGeometryProvider *v) const
248 { 248 {
249 return v->getBackground(); 249 return v->getBackground();
250 } 250 }
251 251
252 QColor 252 QColor
253 SingleColourLayer::getForegroundQColor(View *v) const 253 SingleColourLayer::getForegroundQColor(LayerGeometryProvider *v) const
254 { 254 {
255 return v->getForeground(); 255 return v->getForeground();
256 } 256 }
257 257
258 std::vector<QColor> 258 std::vector<QColor>
259 SingleColourLayer::getPartialShades(View *v) const 259 SingleColourLayer::getPartialShades(LayerGeometryProvider *v) const
260 { 260 {
261 std::vector<QColor> s; 261 std::vector<QColor> s;
262 QColor base = getBaseQColor(); 262 QColor base = getBaseQColor();
263 QColor bg = getBackgroundQColor(v); 263 QColor bg = getBackgroundQColor(v);
264 for (int i = 0; i < 3; ++i) { 264 for (int i = 0; i < 3; ++i) {