TimeMarker: Replaced time_changed signal with View::time_item_apparance_changed

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 2f129a3297f985bd7222b4c302d98db6e2fe9c4c..ed9df36064f74407b1a1ee81f80d11378adbc81c 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -43,7 +43,7 @@ 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),
@@ -57,16 +57,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;
@@ -77,31 +67,36 @@ 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(get_text()).size();
+       const float text_width =
+               max(m.boundingRect(get_text()).size().width(), ArrowSize);
+       const float text_height = m.boundingRect("Tg").size().height();
 
        const QSizeF label_size(
-               text_size.width() + View::LabelPadding.width() * 2,
-               text_size.height() + View::LabelPadding.height() * 2);
+               text_width + View::LabelPadding.width() * 2,
+               text_height + View::LabelPadding.height() * 2);
        const float top = rect.height() - label_size.height() -
                TimeMarker::Offset - 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);
 }
 
@@ -111,7 +106,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
                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(),
@@ -156,6 +151,16 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect)
        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)
 {
        using pv::widgets::Popup;
@@ -181,10 +186,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