Trace: Removed coloured_bg state

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 978f3dc84137d467fcc0d0dee4288710fb280838..2a1eb959634fb23289cc1b12fa8c5613ef795e81 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -19,7 +19,7 @@
 
 #include <extdef.h>
 
 
 #include <extdef.h>
 

-#include <assert.h>
+#include <cassert>

 #include <cmath>
 
 #include <QApplication>
 #include <cmath>
 
 #include <QApplication>


@@ -35,35 +35,30 @@
 #include "pv/widgets/colourbutton.hpp"
 #include "pv/widgets/popup.hpp"
 
 #include "pv/widgets/colourbutton.hpp"
 #include "pv/widgets/popup.hpp"
 

+using std::pair;
+using std::shared_ptr;
+

 namespace pv {
 namespace views {
 namespace TraceView {
 
 namespace pv {
 namespace views {
 namespace TraceView {
 

-const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
+const QPen Trace::AxisPen(QColor(0, 0, 0, 30 * 256 / 100));

 const int Trace::LabelHitPadding = 2;
 
 const int Trace::LabelHitPadding = 2;
 

-const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100);
-const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10 * 255 / 100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15 * 255 / 100);

 
 

-Trace::Trace(std::shared_ptr<data::SignalBase> channel) :
+Trace::Trace(shared_ptr<data::SignalBase> channel) :

        base_(channel),
        popup_(nullptr),
        popup_form_(nullptr)
 {
        base_(channel),
        popup_(nullptr),
        popup_form_(nullptr)
 {

-       GlobalSettings settings;
-       coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
-

        connect(channel.get(), SIGNAL(name_changed(const QString&)),
                this, SLOT(on_name_changed(const QString&)));
        connect(channel.get(), SIGNAL(colour_changed(const QColor&)),
                this, SLOT(on_colour_changed(const QColor&)));
 }
 
        connect(channel.get(), SIGNAL(name_changed(const QString&)),
                this, SLOT(on_name_changed(const QString&)));
        connect(channel.get(), SIGNAL(colour_changed(const QColor&)),
                this, SLOT(on_colour_changed(const QColor&)));
 }
 

-void Trace::set_coloured_bg(bool state)
-{
-       coloured_bg_ = state;
-}
-

 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        const int y = get_visual_y();
 void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        const int y = get_visual_y();


@@ -135,8 +130,7 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 
        create_popup_form();
 
 
        create_popup_form();
 

-       connect(popup_, SIGNAL(closed()),
-               this, SLOT(on_popup_closed()));
+       connect(popup_, SIGNAL(closed()), this, SLOT(on_popup_closed()));

 
        return popup_;
 }
 
        return popup_;
 }


@@ -159,14 +153,17 @@ QRectF Trace::label_rect(const QRectF &rect) const
 
 void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
 
 void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {

-       if (coloured_bg_)
+       const View *view = owner_->view();
+       assert(view);
+
+       if (view->coloured_bg())

                p.setBrush(base_->bgcolour());
        else
                p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
 
        p.setPen(QPen(Qt::NoPen));
 
                p.setBrush(base_->bgcolour());
        else
                p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
 
        p.setPen(QPen(Qt::NoPen));
 

-       const std::pair<int, int> extents = v_extents();
+       const pair<int, int> extents = v_extents();

 
        const int x = 0;
        const int y = get_visual_y() + extents.first;
 
        const int x = 0;
        const int y = get_visual_y() + extents.first;