From 2e15d746583113ad33bf2068f1185280895f882d Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sun, 5 Jun 2011 01:51:45 +0100 Subject: [PATCH] Ride Plot Axis coloring The legend wasted screen estate and was removed, this patch colors the axis labels/ticks so no legend is required. This approach could be adopted for other charts. Also includes a fix to hide realtime view controls which left a screen glitch because they should have been hidden. --- src/AllPlot.cpp | 20 ++++++++++++++++++++ src/HomeWindow.cpp | 1 + src/MainWindow.cpp | 1 + 3 files changed, 22 insertions(+) diff --git a/src/AllPlot.cpp b/src/AllPlot.cpp index ecb0f40de..51fac44dc 100644 --- a/src/AllPlot.cpp +++ b/src/AllPlot.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -314,22 +315,41 @@ AllPlot::configChanged() gridPen.setStyle(Qt::DotLine); grid->setPen(gridPen); + QPalette pal; + // tick draw QwtScaleDraw *sd = new QwtScaleDraw; sd->setTickLength(QwtScaleDiv::MajorTick, 3); setAxisScaleDraw(QwtPlot::xBottom, sd); + sd = new QwtScaleDraw; sd->setTickLength(QwtScaleDiv::MajorTick, 3); setAxisScaleDraw(QwtPlot::yLeft, sd); + pal.setColor(QPalette::WindowText, GColor(CPOWER)); + pal.setColor(QPalette::Text, GColor(CPOWER)); + axisWidget(QwtPlot::yLeft)->setPalette(pal); + sd = new QwtScaleDraw; sd->setTickLength(QwtScaleDiv::MajorTick, 3); setAxisScaleDraw(QwtPlot::yLeft2, sd); + pal.setColor(QPalette::WindowText, GColor(CHEARTRATE)); + pal.setColor(QPalette::Text, GColor(CHEARTRATE)); + axisWidget(QwtPlot::yLeft2)->setPalette(pal); + sd = new QwtScaleDraw; sd->setTickLength(QwtScaleDiv::MajorTick, 3); setAxisScaleDraw(QwtPlot::yRight, sd); + pal.setColor(QPalette::WindowText, GColor(CSPEED)); + pal.setColor(QPalette::Text, GColor(CSPEED)); + axisWidget(QwtPlot::yRight)->setPalette(pal); + sd = new QwtScaleDraw; sd->setTickLength(QwtScaleDiv::MajorTick, 3); setAxisScaleDraw(QwtPlot::yRight2, sd); + pal.setColor(QPalette::WindowText, GColor(CALTITUDE)); + pal.setColor(QPalette::Text, GColor(CALTITUDE)); + axisWidget(QwtPlot::yRight2)->setPalette(pal); + } struct DataPoint { diff --git a/src/HomeWindow.cpp b/src/HomeWindow.cpp index ace22d1a8..f02c06c23 100644 --- a/src/HomeWindow.cpp +++ b/src/HomeWindow.cpp @@ -96,6 +96,7 @@ HomeWindow::HomeWindow(MainWindow *mainWindow, QString name, QString /* windowti tabbed->setTabsClosable(false); tabbed->setPalette(palette); tabbed->setDocumentMode(true); + tabbed->setStyleSheet("QTabBar { alignment: center; }"); // styling commented out whilst work out the differences // between mac and linux and windows diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 1bb0e2047..1e8d2ab90 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -388,6 +388,7 @@ MainWindow::MainWindow(const QDir &home) : // TRAIN WINDOW & CONTROLS trainWindow = new HomeWindow(this, "train", "Training"); + trainWindow->controls()->hide(); trainControls->addWidget(new TrainTool(this, this->home)); // ANALYSIS WINDOW & CONTRAOLS