X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftrace.hpp;h=f911985023b9f8e26af823d3ad9b11a59507db28;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hp=9f0ecd44c2a54ca82706775887db0e453792c6fa;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 9f0ecd4..f911985 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
@@ -27,12 +26,14 @@
#include
#include
-#include
+#include
#include "tracetreeitem.hpp"
#include "pv/data/signalbase.hpp"
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
@@ -56,7 +57,7 @@ private:
static const QColor DarkGrayBGColour;
protected:
- Trace(std::shared_ptr channel);
+ Trace(shared_ptr channel);
public:
/**
@@ -69,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.
@@ -99,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.
@@ -107,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);
@@ -128,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_;