logic analyzer: reworked decoder tool tips to show on hover

Signed-off-by: Andrei Popa <[email protected]>
analogdevicesinc · Feb 15, 2024 · 46a19b2 · 46a19b2
1 parent fade8c6
commit 46a19b2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 20 deletions.
diff --git a/src/logicanalyzer/logic_analyzer.cpp b/src/logicanalyzer/logic_analyzer.cpp
@@ -2012,29 +2012,41 @@ void LogicAnalyzer::initBufferScrolling()
 
 	// When the plot is clicked emit the clicked signal on the curve
 	m_plot.setMouseTracking(true);
-	connect(&m_plot, &CapturePlot::mouseButtonPress, [=](const QMouseEvent *event) {
-		if (event == nullptr) return;
-
-		if (event->button() == Qt::LeftButton) {
-			const auto curve = m_plot.curveAt(event->pos());
-
-			if(curve) {
-				const QPointF curvePos = curve->screenPosToCurvePoint(event->pos());
-				const QString annInfo = dynamic_cast<AnnotationCurve *>(curve)
-								->annotationAt(curvePos)
-								.ann->annotations()[0];
-				scopy::HoverWidget *toolTip = createHoverToolTip(annInfo, event->pos());
-
-				QTimer::singleShot(2000, toolTip, &scopy::HoverWidget::deleteLater);
-				connect(&m_plot, &CapturePlot::mouseButtonRelease, toolTip, &scopy::HoverWidget::show);
-				connect(&m_plot, &CapturePlot::mouseButtonPress, toolTip, &scopy::HoverWidget::deleteLater);
-				connect(m_plot.getZoomer(), &OscPlotZoomer::zoomFinished, toolTip,
-					&scopy::HoverWidget::deleteLater);
 
-				Q_EMIT curve->clicked(curvePos);
+	QTimer *timer = new QTimer();
+	timer->setInterval(500);
+	lastToolTipAnn = NULL;
+
+	connect(timer, &QTimer::timeout, this, [=]() {
+		QPoint pos = m_plot.mapFromGlobal(QCursor::pos());
+		GenericLogicPlotCurve *curve = m_plot.curveAt(pos);
+
+		if(curve) {
+			const QPointF curvePos = curve->screenPosToCurvePoint(pos);
+			const QString *annInfo =
+				&dynamic_cast<AnnotationCurve *>(curve)->annotationAt(curvePos).ann->annotations()[0];
+
+			if(lastToolTipAnn != annInfo) {
+				scopy::HoverWidget *toolTip = createHoverToolTip(*annInfo, pos);
+				QTimer::singleShot(500, [toolTip, annInfo, this]() {
+					if(toolTip && lastToolTipAnn == annInfo)
+						toolTip->show();
+				});
+				Q_EMIT deleteToolTips();
+
+				lastToolTipAnn = annInfo;
+				connect(this, &LogicAnalyzer::deleteToolTips, toolTip,
+					&scopy::HoverWidget::deleteLater);
 			}
+		} else {
+			if(lastToolTipAnn != NULL) {
+				Q_EMIT deleteToolTips();
+			}
+			lastToolTipAnn = NULL;
 		}
 	});
+
+	timer->start();
 }
 
 

diff --git a/src/logicanalyzer/logic_analyzer.h b/src/logicanalyzer/logic_analyzer.h
@@ -122,6 +122,7 @@ class LogicAnalyzer : public LogicTool {
 	int getGroupOffset();
 Q_SIGNALS:
 	void showTool();
+	void deleteToolTips();
 
 private Q_SLOTS:
 
@@ -259,7 +260,7 @@ private Q_SLOTS:
 	DropdownSwitchList* filterMessages;
 	int filterCount = 0;
 
-
+	const QString *lastToolTipAnn;
 };
 } // namespace logic
 } // namespace adiscope