comparison layer/PaintAssistant.cpp @ 198:c2ed5014d4ff

* Scale fixes and feature descriptions in slice layer

 
 #include "base/AudioLevel.h"
 
 #include <QPaintDevice>
 #include <QPainter>
+
+#include <iostream>
 
 void
 PaintAssistant::paintVerticalLevelScale(QPainter &paint, QRect rect,
 					float minVal, float maxVal,
                                         Scale scale, std::vector<int> *vy)

             break;
         }
 
         if (val < minVal || val > maxVal) continue;
 
-        int y = getYForValue(scale, val, minVal, maxVal, rect.y(), rect.height());
+        int y = getYForValue(scale, val, minVal, maxVal, rect.y(), h);
             
         int ny = y;
         if (nval != 0.0) {
-            ny = getYForValue(scale, nval, minVal, maxVal, rect.y(), rect.height());
+            ny = getYForValue(scale, nval, minVal, maxVal, rect.y(), h);
         }
+
+//        std::cerr << "PaintAssistant::paintVerticalLevelScale: val = "
+//                  << val << ", y = " << y << ", h = " << h << std::endl;
 
         bool spaceForLabel = (i == 0 ||
                               abs(y - lastLabelledY) >= textHeight - 1);
         
         if (spaceForLabel) {

             if (scale != LinearScale) {
                 tx = w - 10 - paint.fontMetrics().width(text);
             }
             
             int ty = y;
+
             if (ty < paint.fontMetrics().ascent()) {
                 ty = paint.fontMetrics().ascent();
-            } else if (ty > h - paint.fontMetrics().descent()) {
-                ty = h - paint.fontMetrics().descent();
+//            } else if (ty > rect.y() + h - paint.fontMetrics().descent()) {
+//                ty = rect.y() + h - paint.fontMetrics().descent();
             } else {
                 ty += toff;
             }
+
             paint.drawText(tx, ty, text);
             
             lastLabelledY = ty - toff;
             /*
             if (ny != y) {