X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=pv%2Fviews%2Ftrace%2Fsignal.hpp;h=e10e93eac4d2863d200c530fbcb7ff4a07e72b7d;hb=292b6ebc37281a28982e5d9e43471d9b3eab1d8f;hp=1b9f254330a79fd150f6f73165f5cb910a76b5be;hpb=eeceee9955e7db4ac777d49d1b7a766069476b08;p=pulseview.git
diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp
index 1b9f2543..e10e93ea 100644
--- a/pv/views/trace/signal.hpp
+++ b/pv/views/trace/signal.hpp
@@ -17,12 +17,14 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP
#include
#include
+#include
+#include
#include
#include
@@ -60,7 +62,7 @@ class Signal : public Trace, public ViewItemOwner
Q_OBJECT
protected:
- Signal(pv::Session &session, shared_ptr channel);
+ Signal(pv::Session &session, shared_ptr signal);
public:
/**
@@ -68,8 +70,6 @@ public:
*/
virtual void set_name(QString name);
- virtual shared_ptr data() const = 0;
-
/**
* Determines the closest level change (i.e. edge) to a given sample, which
* is useful for e.g. the "snap to edge" functionality.
@@ -87,8 +87,10 @@ public:
shared_ptr base() const;
virtual void save_settings(QSettings &settings) const;
+ virtual std::map save_settings() const;
virtual void restore_settings(QSettings &settings);
+ virtual void restore_settings(std::map settings);
void paint_back(QPainter &p, ViewItemPaintParams &pp);
@@ -115,4 +117,4 @@ protected:
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP