From 7d366b9afe0868517f2b584b759599593ebf79cd Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 19 Oct 2022 22:35:18 +0200 Subject: [PATCH] statistics: properly initialized selected scatter items Scatter items of selected dives were shown in blue when changing to scatter mode. They should be yellow from the start, not only when hovering over them. Signed-off-by: Berthold Stoeger --- stats/chartitem.cpp | 5 +++-- stats/chartitem.h | 2 +- stats/scatterseries.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stats/chartitem.cpp b/stats/chartitem.cpp index e7e135d30..911910cdf 100644 --- a/stats/chartitem.cpp +++ b/stats/chartitem.cpp @@ -111,8 +111,9 @@ QRectF ChartPixmapItem::getRect() const static const int scatterItemDiameter = 10; static const int scatterItemBorder = 1; -ChartScatterItem::ChartScatterItem(StatsView &v, ChartZValue z) : HideableChartItem(v, z), - positionDirty(false), textureDirty(false), highlight(Highlight::Unselected) +ChartScatterItem::ChartScatterItem(StatsView &v, ChartZValue z, bool selected) : HideableChartItem(v, z), + positionDirty(false), textureDirty(false), + highlight(selected ? Highlight::Selected : Highlight::Unselected) { rect.setSize(QSizeF(static_cast(scatterItemDiameter), static_cast(scatterItemDiameter))); } diff --git a/stats/chartitem.h b/stats/chartitem.h index c2ba06bd2..f8fd4134c 100644 --- a/stats/chartitem.h +++ b/stats/chartitem.h @@ -194,7 +194,7 @@ private: // scatter item here, but so it is for now. class ChartScatterItem : public HideableChartProxyItem { public: - ChartScatterItem(StatsView &v, ChartZValue z); + ChartScatterItem(StatsView &v, ChartZValue z, bool selected); ~ChartScatterItem(); // Currently, there is no highlighted and selected status. diff --git a/stats/scatterseries.cpp b/stats/scatterseries.cpp index 9f5607159..028fe93ef 100644 --- a/stats/scatterseries.cpp +++ b/stats/scatterseries.cpp @@ -25,7 +25,7 @@ ScatterSeries::~ScatterSeries() } ScatterSeries::Item::Item(StatsView &view, ScatterSeries *series, dive *d, double pos, double value) : - item(view.createChartItem(ChartZValue::Series)), + item(view.createChartItem(ChartZValue::Series, d->selected)), d(d), selected(d->selected), pos(pos),