nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 00:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Metadata tile initial creation update fix and time & date field support (#4518)

Browse Source
This commit is contained in:
Paul Johnson
2024-07-03 22:43:36 +01:00
committed by GitHub
parent 553b9aa378
commit 65945e56d9
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Charts/OverviewItems.cpp
View File

@@ -3472,13 +3472,14 @@ MetaOverviewItem::itemPaint(QPainter *painter, const QStyleOptionGraphicsItem *,
// we align centre and mid
QFontMetrics fm(parent->bigfont);
QRectF rect = QFontMetrics(parent->bigfont, parent->device()).boundingRect(value);
if (fieldtype == FIELD_TEXTBOX) {
// long texts need to be formatted into a smaller font an word wrapped
painter->setPen(QColor(150,150,150));
painter->setFont(parent->smallfont);
QRectF rect = QFontMetrics(parent->bigfont, parent->device()).boundingRect(value);
// draw text and wrap / truncate to bounding rectangle
painter->drawText(QRectF(ROWHEIGHT, ROWHEIGHT*2.5, geometry().width()-(ROWHEIGHT*2),
geometry().height()-(ROWHEIGHT*4)), value);
@@ -3487,11 +3488,19 @@ MetaOverviewItem::itemPaint(QPainter *painter, const QStyleOptionGraphicsItem *,
// any other kind of metadata just paint it
painter->setPen(GColor(CPLOTMARKER));
painter->setFont(parent->bigfont);
QString displayValue(value);
if (fieldtype == FIELD_DATE) {
displayValue = (QDate(1900, 1, 1).addDays(value.toInt())).toString("dd/MM/yyyy");
} else if (fieldtype == FIELD_TIME) {
displayValue = (QTime(0,0).addSecs(value.toInt())).toString("hh:mm:ss");
}
QRectF rect = QFontMetrics(parent->bigfont, parent->device()).boundingRect(displayValue);
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
mid + (fm.ascent() / 3.0f)), displayValue); // divided by 3 to account for "gap" at top of font
}
}
if (sparkline) { // if its a numeric metadata field

1
src/Gui/AddTileWizard.cpp
View File

@@ -206,6 +206,7 @@ AddTileFinal::validatePage()
// everthing else is a bit smaller
wizard->item->parent->addItem(0,0,1,7, wizard->item);
}
wizard->item->configChanged(0);
wizard->item->parent->updateGeometry();
}
return true;