DeviceManager: Don't perform scans with DMM drivers

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

diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index ac4540c91c1c3528aed7d5fa25a93cde30f8acf2..b6b15198451e74bbfd014e5591f8d451da531dfc 100644 (file)
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -26,7 +26,7 @@
 #include <QRect>
 #include <QString>
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "tracetreeitem.hpp"
 
@@ -38,6 +38,10 @@ class QFormLayout;
 
 namespace pv {
 
+namespace data {
+class SignalBase;
+}
+
 namespace widgets {
 class Popup;
 }
@@ -60,6 +64,11 @@ protected:
        Trace(shared_ptr<data::SignalBase> channel);
 
 public:
+       /**
+        * Returns the underlying SignalBase instance.
+        */
+       shared_ptr<data::SignalBase> base() const;
+
        /**
         * Sets the name of the signal.
         */
@@ -70,11 +79,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.
@@ -100,7 +104,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.
@@ -108,7 +112,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);
 
@@ -130,7 +134,6 @@ private Q_SLOTS:
 
 protected:
        shared_ptr<data::SignalBase> base_;
-       bool coloured_bg_, coloured_bg_state_;
 
 private:
        pv::widgets::Popup *popup_;