TimeItem: Made paint_label a mandatory field

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

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 8aba0abd1274a7fc778d89a70d8df06fe67347a3..2ff32c53ef9fbbe4d46b2d1d8fb22425ee03626f 100644 (file)
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -38,12 +38,17 @@ namespace view {
 const int CursorPair::DeltaPadding = 8;
 
 CursorPair::CursorPair(View &view) :
+       TimeItem(view),
        first_(new Cursor(view, 0.0)),
-       second_(new Cursor(view, 1.0)),
-       view_(view)
+       second_(new Cursor(view, 1.0))
 {
 }
 
+bool CursorPair::enabled() const
+{
+       return view_.cursors_shown();
+}
+
 shared_ptr<Cursor> CursorPair::first() const
 {
        return first_;
@@ -54,7 +59,29 @@ shared_ptr<Cursor> CursorPair::second() const
        return second_;
 }
 
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+void CursorPair::set_time(double time) {
+       const double delta = second_->time() - first_->time();
+       first_->set_time(time);
+       second_->set_time(time + delta);
+}
+
+float CursorPair::get_x() const
+{
+       return (first_->get_x() + second_->get_x()) / 2.0f;
+}
+
+QPoint CursorPair::point() const
+{
+       return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+       (void)parent;
+       return nullptr;
+}
+
+QRectF CursorPair::label_rect(const QRectF &rect) const
 {
        const QSizeF label_size(
                text_size_.width() + View::LabelPadding.width() * 2,
@@ -70,11 +97,11 @@ QRectF CursorPair::get_label_rect(const QRect &rect) const
                (float)rect.width() + height);
 
        return QRectF(left, rect.height() - label_size.height() -
-               Cursor::ArrowSize - Cursor::Offset - 0.5f,
+               TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
                right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect)
 {
        assert(first_);
        assert(second_);
@@ -82,7 +109,7 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
        const unsigned int prefix = view_.tick_prefix();
 
        compute_text_size(p, prefix);
-       QRectF delta_rect(get_label_rect(rect));
+       QRectF delta_rect(label_rect(rect));
 
        const int radius = delta_rect.height() / 2;
        const QRectF text_rect(delta_rect.intersected(
@@ -91,15 +118,22 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
        {
                const int highlight_radius = delta_rect.height() / 2 - 2;
 
+               if (selected()) {
+                       p.setBrush(Qt::transparent);
+                       p.setPen(highlight_pen());
+                       p.drawRoundedRect(delta_rect, radius, radius);
+               }
+
                p.setBrush(Cursor::FillColour);
-               p.setPen(Cursor::LineColour);
+               p.setPen(Cursor::FillColour.darker());
                p.drawRoundedRect(delta_rect, radius, radius);
 
                delta_rect.adjust(1, 1, -1, -1);
-               p.setPen(Cursor::HighlightColour);
+               p.setPen(Cursor::FillColour.lighter());
                p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-               p.setPen(Cursor::TextColour);
+               p.setPen(SelectableItem::select_text_colour(
+                       Cursor::FillColour));
                p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
                        pv::util::format_time(second_->time() - first_->time(), prefix, 2));
        }