X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=47ba34559a1dd15fa45fc2ff4d979d6a23f17dab;hb=ec39632d1267a42cb858ac6ad7c98486886a46a0;hp=d4bd7140e92fba17cdf300495c35331cfa24ac1f;hpb=ced0548eac9932f80994bde76c3c2bb7a14a4b54;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index d4bd714..47ba345 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -31,7 +31,6 @@
 #include <QFontMetrics>
 #include <QPainter>
 
-#include <pv/util.hpp>
 #include <pv/widgets/popup.hpp>
 
 using std::max;
@@ -41,10 +40,9 @@ namespace pv {
 namespace view {
 
 const int TimeMarker::ArrowSize = 4;
-const int TimeMarker::Offset = 1;
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-	view_(view),
+	TimeItem(view),
 	colour_(colour),
 	time_(time),
 	value_action_(NULL),
@@ -58,16 +56,6 @@ double TimeMarker::time() const
 	return time_;
 }
 
-float TimeMarker::get_x() const
-{
-	return (time_ - view_.offset()) / view_.scale();
-}
-
-QPoint TimeMarker::point() const
-{
-	return QPoint(get_x(), 0);
-}
-
 void TimeMarker::set_time(double time)
 {
 	time_ = time;
@@ -78,39 +66,46 @@ void TimeMarker::set_time(double time)
 		updating_value_widget_ = false;
 	}
 
-	time_changed();
+	view_.time_item_appearance_changed(true, true);
 }
 
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+float TimeMarker::get_x() const
 {
-	const float x = get_x();
-	p.setPen(colour_.darker());
-	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+	return (time_ - view_.offset()) / view_.scale();
 }
 
-QRectF TimeMarker::get_label_rect(const QRect &rect) const
+QPoint TimeMarker::point() const
+{
+	return QPoint(get_x(), 0);
+}
+
+QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
 	const float x = (time_ - view_.offset()) / view_.scale();
 
 	QFontMetrics m(QApplication::font());
-	QSize text_size = m.boundingRect(
-		pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
+	const float text_width =
+		max(m.boundingRect(get_text()).size().width(), ArrowSize);
+	const float text_height = m.height();
 
 	const QSizeF label_size(
-		text_size.width() + View::LabelPadding.width() * 2,
-		text_size.height() + View::LabelPadding.height() * 2);
+		text_width + LabelPadding.width() * 2,
+		text_height + LabelPadding.height() * 2);
 	const float top = rect.height() - label_size.height() -
-		TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+		TimeMarker::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	return QRectF(x - label_size.width() / 2 - 0.5f, top,
+	return QRectF(x - label_size.width() / 2, top,
 		label_size.width(), height);
 }
 
-void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
+	if (!enabled())
+		return;
+
 	const qreal x = (time_ - view_.offset()) / view_.scale();
-	const QRectF r(get_label_rect(rect));
+	const QRectF r(label_rect(rect));
 
 	const QPointF points[] = {
 		r.topLeft(),
@@ -140,7 +135,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 	}
 
 	p.setPen(Qt::transparent);
-	p.setBrush(colour_);
+	p.setBrush(hover ? colour_.lighter() : colour_);
 	p.drawPolygon(points, countof(points));
 
 	p.setPen(colour_.lighter());
@@ -152,8 +147,17 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
 	p.drawPolygon(points, countof(points));
 
 	p.setPen(select_text_colour(colour_));
-	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-		pv::util::format_time(time_, view_.tick_prefix(), 2));
+	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
+}
+
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+{
+	if (!enabled())
+		return;
+
+	const float x = get_x();
+	p.setPen(colour_.darker());
+	p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
 }
 
 pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
@@ -181,10 +185,8 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 void TimeMarker::on_value_changed(double value)
 {
-	if (!updating_value_widget_) {
-		time_ = value;
-		time_changed();
-	}
+	if (!updating_value_widget_)
+		set_time(value);
 }
 
 } // namespace view