X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fcursorpair.cpp;h=7d7d8e4d6477d2e9efbd2a5b84f1bd3f52ec9d79;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=b940090ac8b68861d95ab5e16dec80f630b8cebc;hpb=66279897e318a2549557054d1204c862f7d99469;p=pulseview.git

diff --git a/pv/views/trace/cursorpair.cpp b/pv/views/trace/cursorpair.cpp
index b940090a..7d7d8e4d 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"
@@ -45,13 +46,20 @@ const int CursorPair::DeltaPadding = 8;
 CursorPair::CursorPair(View &view) :
 	TimeItem(view),
 	first_(new Cursor(view, 0.0)),
-	second_(new Cursor(view, 1.0))
+	second_(new Cursor(view, 1.0)),
+	label_incomplete_(true)
 {
 	GlobalSettings::add_change_handler(this);
 
 	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)));
@@ -84,11 +92,24 @@ void CursorPair::set_time(const pv::util::Timestamp& time)
 	second_->set_time(time + delta);
 }
 
+const pv::util::Timestamp CursorPair::time() const
+{
+	return 0;
+}
+
 float CursorPair::get_x() const
 {
 	return (first_->get_x() + second_->get_x()) / 2.0f;
 }
 
+const pv::util::Timestamp CursorPair::delta(const pv::util::Timestamp& other) const
+{
+	if (other < second_->time())
+		return other - first_->time();
+	else
+		return other - second_->time();
+}
+
 QPoint CursorPair::drag_point(const QRect &rect) const
 {
 	return first_->drag_point(rect);
@@ -100,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);
@@ -229,6 +293,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)
@@ -247,6 +320,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());
 
@@ -256,14 +331,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