From f53700ec8450e62cfdbeac9e4957466e7641b9bf Mon Sep 17 00:00:00 2001
From: Joern <joern.rm@gmail.com>
Date: Sun, 10 Aug 2014 14:21:10 +0200
Subject: [PATCH] Small-Plot - wrong Axis Scaling and Labels

... wrong Axis IDs causing the following problems
... X-Axis - not considered time, but high (wrong label/wrong scale)
... Y-Axis - altitude curve not properly scaled
... use similar minimum scale for altitude like AllPlot
... attach Alt-curve first (to be in background)

(used/tested at HrPw window, Split Activity Wizard, Merge Activity
Wizard)
---
 src/SmallPlot.cpp | 48 +++++++++++++++++++++++++----------------------
 src/SmallPlot.h   |  2 +-
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/SmallPlot.cpp b/src/SmallPlot.cpp
index 03be2efcd..1af93b498 100644
--- a/src/SmallPlot.cpp
+++ b/src/SmallPlot.cpp
@@ -41,26 +41,28 @@ SmallPlot::SmallPlot(QWidget *parent) : QwtPlot(parent), d_mrk(NULL), smooth(30)
     static_cast<QwtPlotCanvas*>(canvas())->setFrameStyle(QFrame::NoFrame);
 
     setXTitle();
-
-    wattsCurve = new QwtPlotCurve("Power");
-
-    //timeCurves.resize(36);// wattsCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
-    wattsCurve->setPen(QPen(GColor(CPOWER)));
-    wattsCurve->attach(this);
-
-    hrCurve = new QwtPlotCurve("Heart Rate");
-    // hrCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
-    hrCurve->setPen(QPen(GColor(CHEARTRATE)));
-    hrCurve->attach(this);
+    setAxesCount(QwtAxis::yLeft, 2);
 
     altCurve = new QwtPlotCurve(tr("Altitude"));
     altCurve->setPen(QPen(GColor(CALTITUDE)));
     QColor brush_color = GColor(CALTITUDEBRUSH);
     brush_color.setAlpha(180);
     altCurve->setBrush(brush_color);
-    altCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,2).id);
+    altCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,1));
     altCurve->attach(this);
 
+    wattsCurve = new QwtPlotCurve("Power");
+    //timeCurves.resize(36);// wattsCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
+    wattsCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,0));
+    wattsCurve->setPen(QPen(GColor(CPOWER)));
+    wattsCurve->attach(this);
+
+    hrCurve = new QwtPlotCurve("Heart Rate");
+    // hrCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
+    hrCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,0));
+    hrCurve->setPen(QPen(GColor(CHEARTRATE)));
+    hrCurve->attach(this);
+
     // grid lines on such a small plot look AWFUL
     //grid = new QwtPlotGrid();
     //grid->enableX(false);
@@ -181,36 +183,38 @@ void
 SmallPlot::setYMax()
 {
     double ymax = 0;
-    double y1max = 0;
+    double y1max = 500;
     QString ylabel = "";
     QString y1label = "";
     if (wattsCurve->isVisible()) {
         ymax = max(ymax, wattsCurve->maxYValue());
-        ylabel += QString((ylabel == "") ? "" : " / ") + "Watts";
+        ylabel += QString((ylabel == "") ? "" : " / ") + tr("Watts");
     }
     if (hrCurve->isVisible()) {
         ymax = max(ymax, hrCurve->maxYValue());
-        ylabel += QString((ylabel == "") ? "" : " / ") + "BPM";
+        ylabel += QString((ylabel == "") ? "" : " / ") + tr("BPM");
     }
     if (altCurve->isVisible()) {
-         y1max = altCurve->maxYValue();
+         y1max = max(y1max, altCurve->maxYValue());
          y1label = "m";
     }
-    setAxisScale(yLeft, 0.0, ymax * 1.1);
-    setAxisTitle(yLeft, ylabel);
-    setAxisScale(QwtAxisId(QwtAxis::yLeft,2).id, 0.0, y1max * 1.1);
-    setAxisTitle(QwtAxisId(QwtAxis::yLeft,2).id, y1label);
-    enableAxis(yLeft, false); // hide for a small plot
+    setAxisScale(QwtAxisId(QwtAxis::yLeft,0), 0.0, ymax * 1.1);
+    setAxisTitle(QwtAxisId(QwtAxis::yLeft,0), ylabel);
+    setAxisScale(QwtAxisId(QwtAxis::yLeft,1), 0.0, y1max * 1.1);
+    setAxisTitle(QwtAxisId(QwtAxis::yLeft,1), y1label);
+    setAxisVisible(QwtAxisId(QwtAxis::yLeft,0), false); // hide for a small plot
+    setAxisVisible(QwtAxisId(QwtAxis::yLeft,1), false); // hide for a small plot
 }
 
 void
 SmallPlot::setXTitle()
 {
     setAxisTitle(xBottom, tr("Time (minutes)"));
+    enableAxis(xBottom, true);
 }
 
 void
-SmallPlot::setAxisTitle(int axis, QString label)
+SmallPlot::setAxisTitle(QwtAxisId axis, QString label)
 {
     // setup the default fonts
     QFont stGiles; // hoho - Chart Font St. Giles ... ok you have to be British to get this joke
diff --git a/src/SmallPlot.h b/src/SmallPlot.h
index 180616e25..681c935e4 100644
--- a/src/SmallPlot.h
+++ b/src/SmallPlot.h
@@ -40,7 +40,7 @@ class SmallPlot : public QwtPlot
         int smoothing() const { return smooth; }
         void setData(RideItem *rideItem);
         void setData(RideFile *rideFile);
-        void setAxisTitle(int axis, QString label);
+        void setAxisTitle(QwtAxisId axis, QString label);
         void recalc();
         void setYMax();
         void setXTitle();