X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=f4bffd4cf6820449f4818dba3d78e4505fbfe57e;hp=ee521f0e82a1203438d8a7420ec2336baec89af4;hb=bb4a0e8e0b337988264e43a368b6ce5950d2d6cd;hpb=361c560ed9ef67278916e086ed0b0649ae01b583

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ee521f0e..f4bffd4c 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -18,22 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "ruler.hpp"
+#include <extdef.h>
+
+#include <QApplication>
+#include <QFontMetrics>
+#include <QMouseEvent>
 
+#include "ruler.hpp"
 #include "view.hpp"
-#include "pv/util.hpp"
 
-#include <extdef.h>
+#include <pv/util.hpp>
 
 using namespace Qt;
 
+using std::shared_ptr;
+using std::vector;
+
 namespace pv {
 namespace view {
 
-const int Ruler::RulerHeight = 30;
+const float Ruler::RulerHeight = 2.5f;  // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
 
-const int Ruler::HoverArrowSize = 5;
+const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
 
 Ruler::Ruler(View &parent) :
 	MarginWidget(parent)
@@ -46,7 +53,34 @@ Ruler::Ruler(View &parent) :
 
 QSize Ruler::sizeHint() const
 {
-	return QSize(0, RulerHeight);
+	const int text_height = calculate_text_height();
+	return QSize(0, RulerHeight * text_height);
+}
+
+QSize Ruler::extended_size_hint() const
+{
+	QRectF max_rect;
+	std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		max_rect = max_rect.united(i->label_rect(QRect()));
+	return QSize(0, sizeHint().height() - max_rect.top() / 2 +
+		ViewItem::HighlightRadius);
+}
+
+vector< shared_ptr<ViewItem> > Ruler::items()
+{
+	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+	return vector< shared_ptr<ViewItem> >(
+		time_items.begin(), time_items.end());
+}
+
+shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
+{
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto i = items.rbegin(); i != items.rend(); i++)
+		if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt))
+			return *i;
+	return nullptr;
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -59,9 +93,6 @@ void Ruler::paintEvent(QPaintEvent*)
 	const double tick_period = view_.tick_period();
 	const unsigned int prefix = view_.tick_prefix();
 
-	const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-		AlignLeft | AlignTop, "8").height();
-
 	// Draw the tick marks
 	p.setPen(palette().color(foregroundRole()));
 
@@ -75,9 +106,10 @@ void Ruler::paintEvent(QPaintEvent*)
 	int division = (int)round(first_minor_division -
 		first_major_division * MinorTickSubdivision) - 1;
 
+	const int text_height = calculate_text_height();
+	const int ruler_height = RulerHeight * text_height;
 	const int major_tick_y1 = text_height + ValueMargin * 2;
-	const int tick_y2 = height();
-	const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
+	const int minor_tick_y1 = (major_tick_y1 + ruler_height) / 2;
 
 	double x;
 
@@ -92,13 +124,13 @@ void Ruler::paintEvent(QPaintEvent*)
 				AlignCenter | AlignTop | TextDontClip,
 				pv::util::format_time(t, prefix));
 			p.drawLine(QPointF(x, major_tick_y1),
-				QPointF(x, tick_y2));
+				QPointF(x, ruler_height));
 		}
 		else
 		{
 			// Draw a minor tick
 			p.drawLine(QPointF(x, minor_tick_y1),
-				QPointF(x, tick_y2));
+				QPointF(x, ruler_height));
 		}
 
 		division++;
@@ -106,10 +138,64 @@ void Ruler::paintEvent(QPaintEvent*)
 	} while (x < width());
 
 	// Draw the hover mark
-	draw_hover_mark(p);
+	draw_hover_mark(p, text_height);
+
+	// The cursor labels are not drawn with the arrows exactly on the
+	// bottom line of the widget, because then the selection shadow
+	// would be clipped away.
+	const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius);
+
+	// Draw the items
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items) {
+		const bool highlight = !dragging_ &&
+			i->label_rect(r).contains(mouse_point_);
+		i->paint_label(p, r, highlight);
+	}
 }
 
-void Ruler::draw_hover_mark(QPainter &p)
+void Ruler::mouseMoveEvent(QMouseEvent *e)
+{
+	mouse_point_ = e->pos();
+
+	if (!(e->buttons() & Qt::LeftButton))
+		return;
+
+	if ((e->pos() - mouse_down_point_).manhattanLength() <
+		QApplication::startDragDistance())
+		return;
+
+	// Do the drag
+	dragging_ = true;
+
+	const QPoint delta = e->pos() - mouse_down_point_;
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		if (i->dragging())
+			i->drag_by(delta);
+}
+
+void Ruler::mouseReleaseEvent(QMouseEvent *)
+{
+	using pv::widgets::Popup;
+
+	if (!dragging_ && mouse_down_item_)
+		show_popup(mouse_down_item_);
+
+	dragging_ = false;
+	mouse_down_item_.reset();
+
+	const vector< shared_ptr<TimeItem> > items(view_.time_items());
+	for (auto &i : items)
+		i->drag_release();
+}
+
+void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
+{
+	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+}
+
+void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
 	const int x = view_.hover_point().x();
 
@@ -119,15 +205,21 @@ void Ruler::draw_hover_mark(QPainter &p)
 	p.setPen(QPen(Qt::NoPen));
 	p.setBrush(QBrush(palette().color(foregroundRole())));
 
-	const int b = height() - 1;
+	const int b = RulerHeight * text_height;
+	const float hover_arrow_size = HoverArrowSize * text_height;
 	const QPointF points[] = {
 		QPointF(x, b),
-		QPointF(x - HoverArrowSize, b - HoverArrowSize),
-		QPointF(x + HoverArrowSize, b - HoverArrowSize)
+		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()
 {
 	update();