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

Fix clickthru SEGV for Bubble and TopN overview items

Browse Source 
.. they raised signals in paint events which was highly
   problematic (!)

Fixes #3993
This commit is contained in:
Mark Liversedge
2021-08-04 13:21:09 +01:00
parent 49989f95b6
commit a98ac12d0e
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Charts/OverviewItems.cpp
View File

@@ -700,7 +700,7 @@ MetricOverviewItem::~MetricOverviewItem()
delete sparkline;
}
TopNOverviewItem::TopNOverviewItem(ChartSpace *parent, QString name, QString symbol) : ChartSpaceItem(parent, name), click(false)
TopNOverviewItem::TopNOverviewItem(ChartSpace *parent, QString name, QString symbol) : ChartSpaceItem(parent, name), click(false), clickthru(NULL)
{
// metric
this->type = OverviewItemType::TOPN;
@@ -2735,10 +2735,19 @@ TopNOverviewItem::sceneEvent(QEvent *event)
if (paintarea.contains(cpos)) {
event->accept();
click = true;
clickthru = NULL;
update();
return true;
}
} else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
if (clickthru) {
parent->context->notifyRideSelected(clickthru);
clickthru = NULL;
}
return true;
} else if (event->type() == QEvent::GraphicsSceneHoverEnter) {
update();
@@ -2809,7 +2818,7 @@ TopNOverviewItem::itemPaint(QPainter *painter, const QStyleOptionGraphicsItem *,
painter->setBrush(darkgray);
painter->drawRect(itemarea);
if (click && ranked[i].item) parent->context->notifyRideSelected(ranked[i].item);
clickthru = ranked[i].item;
}
// rank
@@ -3802,6 +3811,7 @@ BubbleViz::BubbleViz(IntervalOverviewItem *parent, QString name) : QGraphicsItem
setZValue(11);
setAcceptHoverEvents(true);
clickthru = NULL;
group = new QSequentialAnimationGroup(this);
QParallelAnimationGroup *par = new QParallelAnimationGroup(this);
@@ -3867,6 +3877,15 @@ BubbleViz::sceneEvent(QEvent *event)
if (event->type() == QEvent::GraphicsSceneMousePress) {
click = true;
clickthru=NULL;
update();
}
if (event->type() == QEvent::GraphicsSceneMouseRelease) {
if (clickthru) {
parent->parent->context->notifyRideSelected(clickthru);
clickthru = NULL;
}
}
return false;
}
@@ -4255,7 +4274,7 @@ BubbleViz::paint(QPainter*painter, const QStyleOptionGraphicsItem *, QWidget*)
}
if (click && nearvalue >= 0 && nearest.item != NULL) {
parent->parent->context->notifyRideSelected(nearest.item);
clickthru = nearest.item;
}
click = false;

2
src/Charts/OverviewItems.h
View File

@@ -296,6 +296,7 @@ class TopNOverviewItem : public ChartSpaceItem
// interaction
bool click;
RideItem *clickthru;
OverviewItemConfig *configwidget;
};
@@ -563,6 +564,7 @@ class BubbleViz : public QObject, public QGraphicsItem
// where is the cursor?
bool hover;
bool click;
RideItem *clickthru;
QPointF plotpos;
// for animated transition