X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fsignal.hpp;h=ca8eea2e4a85f3820de0c6b883bed9f8e69d6812;hp=2cc49a77d1962499c8bece819c5a0824485bf543;hb=HEAD;hpb=526c8c00a61aa5f6ac7e3ee56991db957b45828d

diff --git a/pv/views/trace/signal.hpp b/pv/views/trace/signal.hpp
index 2cc49a77..e10e93ea 100644
--- a/pv/views/trace/signal.hpp
+++ b/pv/views/trace/signal.hpp
@@ -17,16 +17,20 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 <memory>
 
 #include <QComboBox>
+#include <QString>
+#include <QVariant>
 #include <QWidgetAction>
 
 #include <cstdint>
 
+#include <pv/data/logicsegment.hpp>
+
 #include "trace.hpp"
 #include "viewitemowner.hpp"
 
@@ -58,7 +62,7 @@ class Signal : public Trace, public ViewItemOwner
 	Q_OBJECT
 
 protected:
-	Signal(pv::Session &session, shared_ptr<data::SignalBase> channel);
+	Signal(pv::Session &session, shared_ptr<data::SignalBase> signal);
 
 public:
 	/**
@@ -66,7 +70,14 @@ public:
 	 */
 	virtual void set_name(QString name);
 
-	virtual shared_ptr<pv::data::SignalData> 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.
+	 *
+	 * @param sample_pos Sample to use
+	 * @return The changes left and right of the given position
+	 */
+	virtual vector<data::LogicSegment::EdgePair> get_nearest_level_changes(uint64_t sample_pos) = 0;
 
 	/**
 	 * Returns true if the trace is visible and enabled.
@@ -75,19 +86,17 @@ public:
 
 	shared_ptr<data::SignalBase> base() const;
 
-	void set_current_segment(const int segment);
-
-	int get_current_segment() const;
-
 	virtual void save_settings(QSettings &settings) const;
+	virtual std::map<QString, QVariant> save_settings() const;
 
 	virtual void restore_settings(QSettings &settings);
+	virtual void restore_settings(std::map<QString, QVariant> settings);
 
 	void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
 	virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
-	QMenu* create_context_menu(QWidget *parent);
+	QMenu* create_header_context_menu(QWidget *parent);
 
 	void delete_pressed();
 
@@ -102,13 +111,10 @@ protected:
 	pv::Session &session_;
 
 	QComboBox *name_widget_;
-
-	/// The ID of the currently displayed segment
-	int current_segment_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_SIGNAL_HPP