X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fcursorpair.cpp;h=ec7b75addd75180b9b26d288c4b1a20cb805fae9;hp=3e3a6b8e467e3b3fe1e7087f7c2b9e681b7ecedb;hb=HEAD;hpb=4ab6d24485f67ad264ba04b54f9e2562a9fe458d

diff --git a/pv/views/trace/cursorpair.cpp b/pv/views/trace/cursorpair.cpp
index 3e3a6b8e..ec7b75ad 100644
--- a/pv/views/trace/cursorpair.cpp
+++ b/pv/views/trace/cursorpair.cpp
@@ -21,6 +21,7 @@
 #include <cassert>
 
 #include <QColor>
+#include <QMenu>
 #include <QToolTip>
 
 #include "cursorpair.hpp"
@@ -53,6 +54,12 @@ CursorPair::CursorPair(View &view) :
 	GlobalSettings settings;
 	fill_color_ = QColor::fromRgba(settings.value(
 		GlobalSettings::Key_View_CursorFillColor).value<uint32_t>());
+	show_frequency_ = settings.value(
+		GlobalSettings::Key_View_CursorShowFrequency).value<bool>();
+	show_interval_ = settings.value(
+		GlobalSettings::Key_View_CursorShowInterval).value<bool>();
+	show_samples_ = settings.value(
+		GlobalSettings::Key_View_CursorShowSamples).value<bool>();
 
 	connect(&view_, SIGNAL(hover_point_changed(const QWidget*, QPoint)),
 		this, SLOT(on_hover_point_changed(const QWidget*, QPoint)));
@@ -114,6 +121,49 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
 	return nullptr;
 }
 
+QMenu *CursorPair::create_header_context_menu(QWidget *parent)
+{
+	QMenu *menu = new QMenu(parent);
+
+	QAction *displayIntervalAction = new QAction(tr("Display interval"), this);
+	displayIntervalAction->setCheckable(true);
+	displayIntervalAction->setChecked(show_interval_);
+	menu->addAction(displayIntervalAction);
+
+	connect(displayIntervalAction, &QAction::toggled, displayIntervalAction,
+		[=]{
+			GlobalSettings settings;
+			settings.setValue(GlobalSettings::Key_View_CursorShowInterval,
+				!settings.value(GlobalSettings::Key_View_CursorShowInterval).value<bool>());
+		});
+
+	QAction *displayFrequencyAction = new QAction(tr("Display frequency"), this);
+	displayFrequencyAction->setCheckable(true);
+	displayFrequencyAction->setChecked(show_frequency_);
+	menu->addAction(displayFrequencyAction);
+
+	connect(displayFrequencyAction, &QAction::toggled, displayFrequencyAction,
+		[=]{
+			GlobalSettings settings;
+			settings.setValue(GlobalSettings::Key_View_CursorShowFrequency,
+				!settings.value(GlobalSettings::Key_View_CursorShowFrequency).value<bool>());
+		});
+
+	QAction *displaySamplesAction = new QAction(tr("Display samples"), this);
+	displaySamplesAction->setCheckable(true);
+	displaySamplesAction->setChecked(show_samples_);
+	menu->addAction(displaySamplesAction);
+
+	connect(displaySamplesAction, &QAction::toggled, displaySamplesAction,
+		[=]{
+			GlobalSettings settings;
+			settings.setValue(GlobalSettings::Key_View_CursorShowSamples,
+				!settings.value(GlobalSettings::Key_View_CursorShowSamples).value<bool>());
+		});
+
+	return menu;
+}
+
 QRectF CursorPair::label_rect(const QRectF &rect) const
 {
 	const QSizeF label_size(text_size_ + LabelPadding * 2);
@@ -152,11 +202,13 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 
 	text_size_ = p.boundingRect(QRectF(), 0, text).size();
 
+	/* Currently, selecting the middle section between two cursors doesn't do
+	 * anything, so don't highlight it when selected
 	if (selected()) {
 		p.setBrush(Qt::transparent);
 		p.setPen(highlight_pen());
 		p.drawRoundedRect(delta_rect, radius, radius);
-	}
+	} */
 
 	p.setBrush(hover ? Cursor::FillColor.lighter() : Cursor::FillColor);
 	p.setPen(Cursor::FillColor.darker());
@@ -243,6 +295,15 @@ void CursorPair::on_setting_changed(const QString &key, const QVariant &value)
 {
 	if (key == GlobalSettings::Key_View_CursorFillColor)
 		fill_color_ = QColor::fromRgba(value.value<uint32_t>());
+
+	if (key == GlobalSettings::Key_View_CursorShowFrequency)
+		show_frequency_ = value.value<bool>();
+
+	if (key == GlobalSettings::Key_View_CursorShowInterval)
+		show_interval_ = value.value<bool>();
+
+	if (key == GlobalSettings::Key_View_CursorShowSamples)
+		show_samples_ = value.value<bool>();
 }
 
 void CursorPair::on_hover_point_changed(const QWidget* widget, const QPoint& hp)
@@ -261,6 +322,8 @@ void CursorPair::on_hover_point_changed(const QWidget* widget, const QPoint& hp)
 
 QString CursorPair::format_string_sub(int time_precision, int freq_precision, bool show_unit)
 {
+	QString s = " ";
+
 	const pv::util::SIPrefix prefix = view_.tick_prefix();
 	const pv::util::Timestamp diff = abs(second_->time() - first_->time());
 
@@ -270,14 +333,37 @@ QString CursorPair::format_string_sub(int time_precision, int freq_precision, bo
 
 	// We can only show a frequency when there's a time base
 	if (view_.time_unit() == pv::util::TimeUnit::Time) {
-		const QString freq = util::format_value_si(
-			1 / diff.convert_to<double>(), pv::util::SIPrefix::unspecified,
-			freq_precision, (show_unit ? "Hz" : nullptr), false);
-
-		return QString("%1 / %2").arg(time, freq);
+		int items = 0;
+
+		if (show_frequency_) {
+			const QString freq = util::format_value_si(
+				1 / diff.convert_to<double>(), pv::util::SIPrefix::unspecified,
+				freq_precision, (show_unit ? "Hz" : nullptr), false);
+			s = QString("%1").arg(freq);
+			items++;
+		}
+
+		if (show_interval_) {
+			if (items > 0)
+				s = QString("%1 / %2").arg(s, time);
+			else
+				s = QString("%1").arg(time);
+			items++;
+		}
+
+		if (show_samples_) {
+			const QString samples = QString::number(
+				(diff * view_.session().get_samplerate()).convert_to<uint64_t>());
+			if (items > 0)
+				s = QString("%1 / %2").arg(s, samples);
+			else
+				s = QString("%1").arg(samples);
+		}
 	} else
 		// In this case, we return the number of samples, really
-		return time;
+		s = time;
+
+	return s;
 }
 
 } // namespace trace