comparison layer/PaintAssistant.cpp @ 586:1ae54a29e59e

Merge from debug-output branch
author Chris Cannam
date Tue, 14 Jun 2011 14:48:29 +0100
parents f4960f8ce798
children 4806715f7a19
comparison
equal deleted inserted replaced
583:4c484636d5ec 586:1ae54a29e59e
102 int ny = y; 102 int ny = y;
103 if (nval != 0.0) { 103 if (nval != 0.0) {
104 ny = getYForValue(scale, nval, minVal, maxVal, rect.y(), h); 104 ny = getYForValue(scale, nval, minVal, maxVal, rect.y(), h);
105 } 105 }
106 106
107 // std::cerr << "PaintAssistant::paintVerticalLevelScale: val = " 107 // DEBUG << "PaintAssistant::paintVerticalLevelScale: val = "
108 // << val << ", y = " << y << ", h = " << h << std::endl; 108 // << val << ", y = " << y << ", h = " << h << endl;
109 109
110 bool spaceForLabel = (i == 0 || 110 bool spaceForLabel = (i == 0 ||
111 abs(y - lastLabelledY) >= textHeight - 1); 111 abs(y - lastLabelledY) >= textHeight - 1);
112 112
113 if (spaceForLabel) { 113 if (spaceForLabel) {