Revert "Make traces only selectable in the header area"

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 1734921a57c568585c648b177f8ce29019eb1a5e..f7e7ebf25b8ec00a351bb415f7fe696de155e8b6 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -21,7 +21,7 @@
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <QApplication>
 #include <QFormLayout>
@@ -41,10 +41,14 @@ namespace view {
 const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
 const int Trace::LabelHitPadding = 2;
 
+const QColor Trace::DarkBGColour(235, 235, 235);    // Quite light grey
+const QColor Trace::BrightBGColour(245, 245, 245);  // Very light grey
+
 Trace::Trace(QString name) :
        name_(name),
-       popup_(NULL),
-       popup_form_(NULL)
+       coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
+       popup_(nullptr),
+       popup_form_(nullptr)
 {
 }
 
@@ -66,9 +70,28 @@ QColor Trace::colour() const
 void Trace::set_colour(QColor colour)
 {
        colour_ = colour;
+
+       bgcolour_ = colour;
+       bgcolour_.setAlpha(20);
+}
+
+void Trace::set_coloured_bg(bool state)
+{
+       coloured_bg_ = state;
 }
 
-void Trace::paint_label(QPainter &p, int right, bool hover)
+bool Trace::is_draggable() const
+{
+       const View *const view = owner_->view();
+       assert(view);
+
+       QPoint cursor_pos = view->mapFromGlobal(QCursor::pos());
+
+       // The signal is draggable only in the header area
+       return (cursor_pos.x() <= view->header_size().width());
+}
+
+void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        const int y = get_visual_y();
 
@@ -77,7 +100,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
        if (!enabled())
                return;
 
-       const QRectF r = label_rect(right);
+       const QRectF r = label_rect(rect);
 
        // Paint the label
        const float label_arrow_length = r.height() / 2;
@@ -115,7 +138,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
        p.drawPolygon(points, countof(points));
 
        // Paint the text
-       p.setPen(get_text_colour());
+       p.setPen(select_text_colour(colour_));
        p.setFont(QApplication::font());
        p.drawText(QRectF(r.x(), r.y(),
                r.width() - label_arrow_length, r.height()),
@@ -124,7 +147,7 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
 
 QMenu* Trace::create_context_menu(QWidget *parent)
 {
-       QMenu *const menu = SelectableItem::create_context_menu(parent);
+       QMenu *const menu = ViewItem::create_context_menu(parent);
 
        return menu;
 }
@@ -134,6 +157,8 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        using pv::widgets::Popup;
 
        popup_ = new Popup(parent);
+       popup_->set_position(parent->mapToGlobal(
+               point(parent->rect())), Popup::Right);
 
        create_popup_form();
 
@@ -143,34 +168,54 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
        return popup_;
 }
 
-QRectF Trace::label_rect(int right) const
+QRectF Trace::label_rect(const QRectF &rect) const
 {
        using pv::view::View;
 
        QFontMetrics m(QApplication::font());
        const QSize text_size(
-               m.boundingRect(QRect(), 0, name_).width(),
-               m.boundingRect(QRect(), 0, "Tg").height());
+               m.boundingRect(QRect(), 0, name_).width(), m.height());
        const QSizeF label_size(
-               text_size.width() + View::LabelPadding.width() * 2,
-               ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+               text_size.width() + LabelPadding.width() * 2,
+               ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
        const float half_height = label_size.height() / 2;
        return QRectF(
-               right - half_height - label_size.width() - 0.5,
+               rect.right() - half_height - label_size.width() - 0.5,
                get_visual_y() + 0.5f - half_height,
                label_size.width() + half_height,
                label_size.height());
 }
 
-QColor Trace::get_text_colour() const
+QRectF Trace::hit_box_rect(const ViewItemPaintParams &pp) const
+{
+       const float h = QFontMetrics(QApplication::font()).height();
+       return QRectF(pp.left(), get_visual_y() - h / 2.0f,
+               pp.width(), h);
+}
+
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
-       return (colour_.lightness() > 64) ? Qt::black : Qt::white;
+       if (coloured_bg_)
+               p.setBrush(bgcolour_);
+       else
+               p.setBrush(bgcolour_state_ ? BrightBGColour : DarkBGColour);
+
+       p.setPen(QPen(Qt::NoPen));
+
+       const std::pair<int, int> extents = v_extents();
+
+       const int x = 0;
+       const int y = get_visual_y() + extents.first;
+       const int w = pp.right() - pp.left();
+       const int h = extents.second - extents.first;
+
+       p.drawRect(x, y, w, h);
 }
 
-void Trace::paint_axis(QPainter &p, int y, int left, int right)
+void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
        p.setPen(AxisPen);
-       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+       p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f));
 }
 
 void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
@@ -216,8 +261,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 void Trace::on_popup_closed()
 {
-       popup_ = NULL;
-       popup_form_ = NULL;
+       popup_ = nullptr;
+       popup_form_ = nullptr;
 }
 
 void Trace::on_text_changed(const QString &text)
@@ -233,7 +278,7 @@ void Trace::on_colour_changed(const QColor &colour)
        set_colour(colour);
 
        if (owner_)
-               owner_->appearance_changed(true, false);
+               owner_->row_item_appearance_changed(true, true);
 }
 
 } // namespace view