X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=f911985023b9f8e26af823d3ad9b11a59507db28;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hp=11f80ccbeb6426b0d163eecd7a2b8f36d20a7a7a;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp index 11f80cc..f911985 100644 --- a/pv/view/trace.hpp +++ b/pv/view/trace.hpp @@ -26,12 +26,14 @@ #include #include -#include +#include #include "tracetreeitem.hpp" #include "pv/data/signalbase.hpp" +using std::shared_ptr; + class QFormLayout; namespace pv { @@ -55,7 +57,7 @@ private: static const QColor DarkGrayBGColour; protected: - Trace(std::shared_ptr channel); + Trace(shared_ptr channel); public: /** @@ -68,11 +70,6 @@ public: */ virtual void set_colour(QColor colour); - /** - * Enables or disables the coloured background for this trace. - */ - void set_coloured_bg(bool state); - /** * Paints the signal label. * @param p the QPainter to paint into. @@ -98,7 +95,7 @@ protected: * @param p The QPainter to paint into. * @param pp The painting parameters object to paint with. */ - virtual void paint_back(QPainter &p, const ViewItemPaintParams &pp); + virtual void paint_back(QPainter &p, ViewItemPaintParams &pp); /** * Paints a zero axis across the viewport. @@ -106,7 +103,7 @@ protected: * @param pp the painting parameters object to paint with. * @param y the y-offset of the axis. */ - void paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y); + void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y); void add_colour_option(QWidget *parent, QFormLayout *form); @@ -127,8 +124,8 @@ private Q_SLOTS: void on_colouredit_changed(const QColor &colour); protected: - std::shared_ptr base_; - bool coloured_bg_, coloured_bg_state_; + shared_ptr base_; + bool coloured_bg_state_; private: pv::widgets::Popup *popup_;