From 00a52abff4bc1958f28db70680b3e777c2e193d5 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Mon, 11 Nov 2013 22:04:06 +0000
Subject: [PATCH] UI Nits: Less is more

Further removal of chart decorations ala the recent
changes to the ride plot, now applied to the other
charts.
---
 src/AllPlot.cpp     | 1 +
 src/CpintPlot.cpp   | 2 ++
 src/LTMPlot.cpp     | 2 ++
 src/PfPvPlot.cpp    | 6 ++++--
 src/PowerHist.cpp   | 2 ++
 src/ScatterPlot.cpp | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/AllPlot.cpp b/src/AllPlot.cpp
index 2f184cc10..853acf4d3 100644
--- a/src/AllPlot.cpp
+++ b/src/AllPlot.cpp
@@ -550,6 +550,7 @@ AllPlot::configChanged()
     sd = new QwtScaleDraw;
     sd->enableComponent(QwtScaleDraw::Ticks, false);
     sd->enableComponent(QwtScaleDraw::Backbone, false);
+    sd->setLabelRotation(90);// in the 000s
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
     setAxisScaleDraw(QwtPlot::yRight3, sd);
     pal.setColor(QPalette::WindowText, GColor(CWBAL));
diff --git a/src/CpintPlot.cpp b/src/CpintPlot.cpp
index 29dbe7b86..e3f3788a9 100644
--- a/src/CpintPlot.cpp
+++ b/src/CpintPlot.cpp
@@ -66,6 +66,8 @@ CpintPlot::CpintPlot(Context *context, QString p, const Zones *zones) :
 
     QwtScaleDraw *sd = new QwtScaleDraw;
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
+    sd->enableComponent(QwtScaleDraw::Ticks, false);
+    sd->enableComponent(QwtScaleDraw::Backbone, false);
     setAxisScaleDraw(yLeft, sd);
     setAxisTitle(yLeft, tr("Average Power (watts)"));
     setAxisMaxMinor(yLeft, 0);
diff --git a/src/LTMPlot.cpp b/src/LTMPlot.cpp
index 006bc4f40..74672d4ad 100644
--- a/src/LTMPlot.cpp
+++ b/src/LTMPlot.cpp
@@ -1055,6 +1055,8 @@ LTMPlot::chooseYAxis(QString units)
         axes.insert(units, chosen);
         QwtScaleDraw *sd = new QwtScaleDraw;
         sd->setTickLength(QwtScaleDiv::MajorTick, 3);
+        sd->enableComponent(QwtScaleDraw::Ticks, false);
+        sd->enableComponent(QwtScaleDraw::Backbone, false);
         setAxisScaleDraw(chosen, sd);
         setAxisMaxMinor(chosen, 0);
         return chosen;
diff --git a/src/PfPvPlot.cpp b/src/PfPvPlot.cpp
index 232f73348..f62f3631a 100644
--- a/src/PfPvPlot.cpp
+++ b/src/PfPvPlot.cpp
@@ -136,6 +136,8 @@ PfPvPlot::PfPvPlot(Context *context)
     setAxisScaleDraw(xBottom, sd);
     sd = new QwtScaleDraw;
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
+    sd->enableComponent(QwtScaleDraw::Ticks, false);
+    sd->enableComponent(QwtScaleDraw::Backbone, false);
     setAxisScaleDraw(yLeft, sd);
 
     mX = new QwtPlotMarker();
@@ -593,7 +595,7 @@ PfPvPlot::recalc()
                 double aepf = (p1->watts * 60.0) / (p1->cad * cl_ * 2.0 * PI);
                 double cpv = (p1->cad * cl_ * 2.0 * PI) / 60.0;
 
-                if (aepf > maxAEPF) maxAEPF = aepf;
+                if (aepf < 255 && aepf > maxAEPF) maxAEPF = aepf;
                 if (cpv > maxCPV) maxCPV = cpv;
             }
         }
@@ -601,7 +603,7 @@ PfPvPlot::recalc()
 
     if (maxAEPF > 600) {
 
-        setAxisScale(yLeft, 0, maxAEPF < 2500 ? maxAEPF * 1.1 : 2500); // a bit of headroom
+        setAxisScale(yLeft, 0, (maxAEPF < 2500) ? (maxAEPF * 1.1) : 2500); // a bit of headroom
         tiqMarker[0]->setYValue(maxAEPF);
         tiqMarker[1]->setYValue(maxAEPF);
 
diff --git a/src/PowerHist.cpp b/src/PowerHist.cpp
index e1a35f1a8..e6a2f8653 100644
--- a/src/PowerHist.cpp
+++ b/src/PowerHist.cpp
@@ -555,6 +555,8 @@ PowerHist::setYMax()
 
     QwtScaleDraw *sd = new QwtScaleDraw;
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
+    sd->enableComponent(QwtScaleDraw::Ticks, false);
+    sd->enableComponent(QwtScaleDraw::Backbone, false);
     setAxisScaleDraw(QwtPlot::yLeft, sd);
 }
 
diff --git a/src/ScatterPlot.cpp b/src/ScatterPlot.cpp
index 845a68664..c73953386 100644
--- a/src/ScatterPlot.cpp
+++ b/src/ScatterPlot.cpp
@@ -165,6 +165,8 @@ ScatterPlot::ScatterPlot(Context *context) : context(context)
 
     sd = new QwtScaleDraw;
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
+    sd->enableComponent(QwtScaleDraw::Ticks, false);
+    sd->enableComponent(QwtScaleDraw::Backbone, false);
     setAxisScaleDraw(QwtPlot::yLeft, sd);
 
     connect(context, SIGNAL(configChanged()), this, SLOT(configChanged()));