comparison layer/Layer.cpp @ 274:b9380f679f70

* Fix centre line position
* Fix failure to update overview when generating peaks from wav file
* Provide y-coordinate scale values and differences for spectrum measurement
  mode, and fix values for waveform (inc dB for both)
* Add Printer colour scheme (may be futile)

     const Model *m = getModel();
     if (!m) return false;
 
     value = float(v->getFrameForX(x)) / m->getSampleRate();
     unit = "s";
+    return true;
+}
+
+bool
+Layer::getYScaleDifference(const View *v, int y0, int y1,
+                           float &diff, QString &unit) const
+{
+    float v0, v1;
+    if (!getYScaleValue(v, y0, v0, unit) ||
+        !getYScaleValue(v, y1, v1, unit)) {
+        diff = 0.f;
+        return false;
+    }
+    diff = fabsf(v1 - v0);
     return true;
 }
 
 bool
 Layer::MeasureRect::operator<(const MeasureRect &mr) const

     if (!m_haveDraggingRect) return;
 
     m_draggingRect.pixrect = QRect(m_draggingRect.pixrect.x(),
                                    m_draggingRect.pixrect.y(),
                                    e->x() - m_draggingRect.pixrect.x(),
-                                   e->y() - m_draggingRect.pixrect.y())
-        .normalized();
+                                   e->y() - m_draggingRect.pixrect.y());
 
     setMeasureRectYCoord(v, m_draggingRect, false, e->y());
     
     if (hasTimeXAxis()) {
         m_draggingRect.endFrame = v->getFrameForX(e->x());

         }
         
         i->pixrect = QRect(x0, i->pixrect.y(), x1 - x0, i->pixrect.height());
 
         updateMeasureRectYCoords(v, *i);
-        
-        i->pixrect = i->pixrect.normalized();
     }
 }
 
 void
 Layer::updateMeasureRectYCoords(View *v, const MeasureRect &r) const

         if (r.endFrame <= long(v->getEndFrame())) {
             x1 = v->getXForFrame(r.endFrame);
         }
         
         QRect pr = QRect(x0, r.pixrect.y(), x1 - x0, r.pixrect.height());
-        
         r.pixrect = pr;
     }
-    
-    v->drawMeasurementRect(paint, this, r.pixrect, focus);
+
+    v->drawMeasurementRect(paint, this, r.pixrect.normalized(), focus);
 }
 
 QString
 Layer::toXmlString(QString indent, QString extraAttributes) const
 {