diff view/ViewProxy.h @ 1537:4f8c72adbf43

Clarify naming of some view-related methods. Rename LayerGeometryProvider::getValueExtents to getVisibleExtentsForUnit, and View::getTextLabelHeight to getTextLabelYCoord. Add View::getVisibleExtentsForAnyUnit to be used to determine which unit to adopt in a new e.g. box layer.

--- a/view/ViewProxy.h	Tue Oct 15 09:32:24 2019 +0100
+++ b/view/ViewProxy.h	Tue Oct 15 11:40:56 2019 +0100
@@ -95,27 +95,23 @@
         return m_view->getFrequencyForY
             (y / m_scaleFactor, minFreq, maxFreq, logarithmic);
     }
-    int getTextLabelHeight(const Layer *layer, QPainter &paint) const override {
-        return m_scaleFactor * m_view->getTextLabelHeight(layer, paint);
+    int getTextLabelYCoord(const Layer *layer, QPainter &paint) const override {
+        return m_scaleFactor * m_view->getTextLabelYCoord(layer, paint);
     }
-    bool getValueExtents(QString unit, double &min, double &max,
-                                 bool &log) const override {
-        return m_view->getValueExtents(unit, min, max, log);
+    bool getVisibleExtentsForUnit(QString unit, double &min, double &max,
+                                  bool &log) const override {
+        return m_view->getVisibleExtentsForUnit(unit, min, max, log);
     }
     ZoomLevel getZoomLevel() const override {
         ZoomLevel z = m_view->getZoomLevel();
-        //!!!
-//        cerr << "getZoomLevel: from " << z << " to ";
         if (z.zone == ZoomLevel::FramesPerPixel) {
             z.level /= m_scaleFactor;
             if (z.level < 1) {
                 z.level = 1;
             }
         } else {
-            //!!!???
             z.level *= m_scaleFactor;
         }
-//        cerr << z << endl;
         return z;
     }
     QRect getPaintRect() const override {