nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Overview add units to metric cards

Browse Source 
.. only if non-blank and not units of time since the time
   format indicates units
This commit is contained in:
Mark Liversedge
2017-02-10 23:00:24 +00:00
parent 962d77553f
commit d5dc72bff3
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Charts/OverviewWindow.cpp
View File

@@ -144,14 +144,29 @@ Card::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
painter->drawText(QPointF(ROWHEIGHT /2.0f, QFontMetrics(titlefont, parent->device()).height()), name);
if (type == METRIC) {
// we need the metric units
if (metric == NULL) {
// get the metric details
RideMetricFactory &factory = RideMetricFactory::instance();
metric = const_cast<RideMetric*>(factory.rideMetric(settings.symbol));
if (metric) units = metric->units(parent->context->athlete->useMetricUnits);
}
// paint the value in the middle using a font 2xROWHEIGHT
QFont bigfont;
bigfont.setPointSize(ROWHEIGHT*2);
painter->setPen(GColor(CPLOTMARKER));
painter->setFont(bigfont);
// mid is slightly higher to account for space around title
double mid = (ROWHEIGHT*1.5f) + ((geometry().height() - (ROWHEIGHT*2)) / 2.0f);
QFont smallfont;
smallfont.setPointSize(ROWHEIGHT*0.6f);
double addy = 0;
if (units != "" && units != tr("seconds")) addy = QFontMetrics(smallfont).height();
// mid is slightly higher to account for space around title, move mid up
double mid = (ROWHEIGHT*1.5f) + ((geometry().height() - (ROWHEIGHT*2)) / 2.0f) - (addy/2);
// we align centre and mid
QFontMetrics fm(bigfont);
@@ -159,6 +174,15 @@ Card::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) {
painter->drawText(QPointF((geometry().width() - rect.width()) / 2.0f,
mid + (fm.ascent() / 3.0f)), value); // divided by 3 to account for "gap" at top of font
// now units
if (addy > 0) {
painter->setPen(QColor(100,100,100));
painter->setFont(smallfont);
painter->drawText(QPointF((geometry().width() - QFontMetrics(smallfont).width(units)) / 2.0f,
mid + (fm.ascent() / 3.0f) + addy), units); // divided by 3 to account for "gap" at top of font
}
}
}
@@ -747,7 +771,7 @@ OverviewWindow::eventFilter(QObject *, QEvent *event)
int setdeep = stateData.yresize.deep + addrows;
//min height
if (setdeep < 7) setdeep=7; // min of 5 rows
if (setdeep < 6) setdeep=6; // min of 6 rows
stateData.yresize.card->deep = setdeep;

3
src/Charts/OverviewWindow.h
View File

@@ -26,6 +26,7 @@
#include "Colors.h"
#include "Context.h"
#include "RideItem.h"
#include "RideMetric.h"
// QGraphics
#include <QGraphicsScene>
@@ -73,6 +74,7 @@ class Card : public QGraphicsWidget
// a sensible default?
type = NONE;
metric = NULL;
}
void setData(RideItem *item);
@@ -81,6 +83,7 @@ class Card : public QGraphicsWidget
enum cardType { NONE, METRIC, META, SERIES, ZONE } type;
typedef enum cardType CardType;
QString value, units;
RideMetric *metric;
// settings
struct {