X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fruler.cpp;h=1204559c5c943d5838a968a1bd0d636c5617dfc1;hp=63d3d23fcb946536f173ee0e184aacd1084d0039;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=5408524db09d7a3b1f2f47f9a749ac9901e800e2

diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
index 63d3d23f..1204559c 100644
--- a/pv/views/trace/ruler.cpp
+++ b/pv/views/trace/ruler.cpp
@@ -21,8 +21,11 @@
 
 #include <QApplication>
 #include <QFontMetrics>
+#include <QMenu>
 #include <QMouseEvent>
 
+#include <pv/globalsettings.hpp>
+
 #include "ruler.hpp"
 #include "view.hpp"
 
@@ -47,8 +50,8 @@ Ruler::Ruler(View &parent) :
 {
 	setMouseTracking(true);
 
-	connect(&view_, SIGNAL(hover_point_changed(QPoint)),
-		this, SLOT(hover_point_changed(QPoint)));
+	connect(&view_, SIGNAL(hover_point_changed(const QWidget*, QPoint)),
+		this, SLOT(on_hover_point_changed(const QWidget*, QPoint)));
 	connect(&view_, SIGNAL(offset_changed()),
 		this, SLOT(invalidate_tick_position_cache()));
 	connect(&view_, SIGNAL(scale_changed()),
@@ -111,6 +114,40 @@ QString Ruler::format_time_with_distance(
 		return pv::util::format_time_minutes(t, precision, sign);
 }
 
+pv::util::Timestamp Ruler::get_time_from_x_pos(uint32_t x) const
+{
+	return view_.ruler_offset() + ((double)x + 0.5) * view_.scale();
+}
+
+void Ruler::contextMenuEvent(QContextMenuEvent *event)
+{
+	context_menu_x_pos_ = event->pos().x();
+
+	QMenu *const menu = new QMenu(this);
+
+	QAction *const create_marker = new QAction(tr("Create marker here"), this);
+	connect(create_marker, SIGNAL(triggered()), this, SLOT(on_createMarker()));
+	menu->addAction(create_marker);
+
+	QAction *const toggle_hover_marker = new QAction(this);
+	connect(toggle_hover_marker, SIGNAL(triggered()), this, SLOT(on_toggleHoverMarker()));
+	menu->addAction(toggle_hover_marker);
+
+	GlobalSettings settings;
+	const bool hover_marker_shown =
+		settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool();
+	toggle_hover_marker->setText(hover_marker_shown ?
+		tr("Disable mouse hover marker") : tr("Enable mouse hover marker"));
+
+	menu->popup(event->globalPos());
+}
+
+void Ruler::resizeEvent(QResizeEvent*)
+{
+	// the tick calculation depends on the width of this widget
+	invalidate_tick_position_cache();
+}
+
 vector< shared_ptr<ViewItem> > Ruler::items()
 {
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
@@ -127,6 +164,11 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 	return nullptr;
 }
 
+void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
+{
+	view_.add_flag(get_time_from_x_pos(event->x()));
+}
+
 void Ruler::paintEvent(QPaintEvent*)
 {
 	if (!tick_position_cache_) {
@@ -199,7 +241,32 @@ void Ruler::paintEvent(QPaintEvent*)
 	}
 }
 
-Ruler::TickPositions Ruler::calculate_tick_positions(
+void Ruler::draw_hover_mark(QPainter &p, int text_height)
+{
+	const int x = view_.hover_point().x();
+
+	if (x == -1)
+		return;
+
+	p.setPen(QPen(Qt::NoPen));
+	p.setBrush(QBrush(palette().color(foregroundRole())));
+
+	const int b = RulerHeight * text_height;
+	const float hover_arrow_size = HoverArrowSize * text_height;
+	const QPointF points[] = {
+		QPointF(x, b),
+		QPointF(x - hover_arrow_size, b - hover_arrow_size),
+		QPointF(x + hover_arrow_size, b - hover_arrow_size)
+	};
+	p.drawPolygon(points, countof(points));
+}
+
+int Ruler::calculate_text_height() const
+{
+	return QFontMetrics(font()).ascent();
+}
+
+TickPositions Ruler::calculate_tick_positions(
 	const pv::util::Timestamp& major_period,
 	const pv::util::Timestamp& offset,
 	const double scale,
@@ -237,38 +304,9 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
 	return tp;
 }
 
-void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
-{
-	view_.add_flag(view_.ruler_offset() + ((double)event->x() + 0.5) * view_.scale());
-}
-
-void Ruler::draw_hover_mark(QPainter &p, int text_height)
-{
-	const int x = view_.hover_point().x();
-
-	if (x == -1)
-		return;
-
-	p.setPen(QPen(Qt::NoPen));
-	p.setBrush(QBrush(palette().color(foregroundRole())));
-
-	const int b = RulerHeight * text_height;
-	const float hover_arrow_size = HoverArrowSize * text_height;
-	const QPointF points[] = {
-		QPointF(x, b),
-		QPointF(x - hover_arrow_size, b - hover_arrow_size),
-		QPointF(x + hover_arrow_size, b - hover_arrow_size)
-	};
-	p.drawPolygon(points, countof(points));
-}
-
-int Ruler::calculate_text_height() const
-{
-	return QFontMetrics(font()).ascent();
-}
-
-void Ruler::hover_point_changed(const QPoint &hp)
+void Ruler::on_hover_point_changed(const QWidget* widget, const QPoint &hp)
 {
+	(void)widget;
 	(void)hp;
 
 	update();
@@ -279,10 +317,16 @@ void Ruler::invalidate_tick_position_cache()
 	tick_position_cache_ = boost::none;
 }
 
-void Ruler::resizeEvent(QResizeEvent*)
+void Ruler::on_createMarker()
 {
-	// the tick calculation depends on the width of this widget
-	invalidate_tick_position_cache();
+	view_.add_flag(get_time_from_x_pos(mouse_down_point_.x()));
+}
+
+void Ruler::on_toggleHoverMarker()
+{
+	GlobalSettings settings;
+	const bool state = settings.value(GlobalSettings::Key_View_ShowHoverMarker).toBool();
+	settings.setValue(GlobalSettings::Key_View_ShowHoverMarker, !state);
 }
 
 } // namespace trace