Mercurial > hg > svgui
comparison layer/SingleColourLayer.cpp @ 585:f4960f8ce798 debug-output
Convert many cerrs to DEBUGs
author | Chris Cannam |
---|---|
date | Mon, 16 May 2011 17:19:25 +0100 |
parents | e1a9e478b7f2 |
children | 4806715f7a19 |
comparison
equal
deleted
inserted
replaced
584:1fe7951a61e8 | 585:f4960f8ce798 |
---|---|
130 | 130 |
131 void | 131 void |
132 SingleColourLayer::setDefaultColourFor(View *v) | 132 SingleColourLayer::setDefaultColourFor(View *v) |
133 { | 133 { |
134 #ifdef DEBUG_COLOUR_SELECTION | 134 #ifdef DEBUG_COLOUR_SELECTION |
135 std::cerr << "SingleColourLayer::setDefaultColourFor: m_colourExplicitlySet = " << m_colourExplicitlySet << ", m_defaultColourSet " << m_defaultColourSet << std::endl; | 135 DEBUG << "SingleColourLayer::setDefaultColourFor: m_colourExplicitlySet = " << m_colourExplicitlySet << ", m_defaultColourSet " << m_defaultColourSet << endl; |
136 #endif | 136 #endif |
137 | 137 |
138 if (m_colourExplicitlySet || m_defaultColourSet) return; | 138 if (m_colourExplicitlySet || m_defaultColourSet) return; |
139 | 139 |
140 if (v) m_defaultColourSet = true; // v==0 case doesn't really count | 140 if (v) m_defaultColourSet = true; // v==0 case doesn't really count |
310 m_colourExplicitlySet = true; | 310 m_colourExplicitlySet = true; |
311 | 311 |
312 if (m_colour != colour) { | 312 if (m_colour != colour) { |
313 | 313 |
314 #ifdef DEBUG_COLOUR_SELECTION | 314 #ifdef DEBUG_COLOUR_SELECTION |
315 std::cerr << "SingleColourLayer::setProperties: changing colour from " << m_colour << " to " << colour << std::endl; | 315 DEBUG << "SingleColourLayer::setProperties: changing colour from " << m_colour << " to " << colour << endl; |
316 #endif | 316 #endif |
317 | 317 |
318 if (m_colourRefCount.find(m_colour) != m_colourRefCount.end() && | 318 if (m_colourRefCount.find(m_colour) != m_colourRefCount.end() && |
319 m_colourRefCount[m_colour] > 0) { | 319 m_colourRefCount[m_colour] > 0) { |
320 m_colourRefCount[m_colour]--; | 320 m_colourRefCount[m_colour]--; |