Implement "use coloured background" functionality

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index df5a954b43a216f66d7cb11c5799464d882a3fe4..3727afa2de246912c8834dc0f3977d5131ec25bc 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>
@@ -43,8 +43,9 @@ const int Trace::LabelHitPadding = 2;
 
 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,6 +67,14 @@ 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, const QRect &rect, bool hover)
@@ -134,6 +143,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();
 
@@ -161,6 +172,30 @@ QRectF Trace::label_rect(const QRectF &rect) const
                label_size.height());
 }
 
+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)
+{
+       if (coloured_bg_) {
+               p.setPen(QPen(Qt::NoPen));
+               p.setBrush(bgcolour_);
+
+               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, const ViewItemPaintParams &pp, int y)
 {
        p.setPen(AxisPen);
@@ -210,8 +245,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)
@@ -227,7 +262,7 @@ void Trace::on_colour_changed(const QColor &colour)
        set_colour(colour);
 
        if (owner_)
-               owner_->row_item_appearance_changed(true, false);
+               owner_->row_item_appearance_changed(true, true);
 }
 
 } // namespace view