X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=74a5c3755c6fb4437ef8b9b815091d0cf2d0cbc8;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hp=9ba86b7260b1d72935e857b50c88ea28d499ed86;hpb=6e2c3c855dff36f6e946e2a54d576bea699f4a61;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 9ba86b72..74a5c375 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -23,6 +23,7 @@
 
 #include <stdint.h>
 
+#include <list>
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ -35,6 +36,7 @@
 #include <pv/data/signaldata.hpp>
 
 #include "cursorpair.hpp"
+#include "flag.hpp"
 #include "rowitemowner.hpp"
 
 namespace pv {
@@ -65,11 +67,6 @@ private:
 
 	static const int ScaleUnits[3];
 
-public:
-	static const QColor CursorAreaColour;
-
-	static const QSizeF LabelPadding;
-
 public:
 	explicit View(Session &session, QWidget *parent = 0);
 
@@ -105,8 +102,17 @@ public:
 	 * seconds.
 	 */
 	double offset() const;
+
+	/**
+	 * Returns the vertical scroll offset.
+	 */
 	int owner_visual_v_offset() const;
 
+	/**
+	 * Sets the visual v-offset.
+	 */
+	void set_v_offset(int offset);
+
 	/**
 	 * Returns the SI prefix to apply to the graticule time markings.
 	 */
@@ -161,6 +167,21 @@ public:
 	 */
 	std::shared_ptr<CursorPair> cursors() const;
 
+	/**
+	 * Adds a new flag at a specified time.
+	 */
+	void add_flag(double time);
+
+	/**
+	 * Removes a flag from the list.
+	 */
+	void remove_flag(std::shared_ptr<Flag> flag);
+
+	/**
+	 * Gets the list of flags.
+	 */
+	std::vector< std::shared_ptr<Flag> > flags() const;
+
 	const QPoint& hover_point() const;
 
 	void update_viewport();
@@ -170,8 +191,6 @@ public:
 Q_SIGNALS:
 	void hover_point_changed();
 
-	void signals_moved();
-
 	void selection_changed();
 
 	void scale_offset_changed();
@@ -232,21 +251,18 @@ private:
 
 public:
 	void row_item_appearance_changed(bool label, bool content);
+	void time_item_appearance_changed(bool label, bool content);
 
 	void extents_changed(bool horz, bool vert);
 
 private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
-	void v_scroll_value_changed(int value);
+	void v_scroll_value_changed();
 
 	void signals_changed();
 	void data_updated();
 
-	void marker_time_changed();
-
-	void on_signals_moved();
-
 	void process_sticky_events();
 
 	void on_hover_point_changed();
@@ -256,7 +272,6 @@ private:
 
 	Viewport *viewport_;
 	Ruler *ruler_;
-	CursorHeader *cursorheader_;
 	Header *header_;
 
 	/// The view time scale in seconds per pixel.
@@ -265,7 +280,6 @@ private:
 	/// The view time offset in seconds.
 	double offset_;
 
-	int v_offset_;
 	bool updating_scroll_;
 
 	double tick_period_;
@@ -274,6 +288,9 @@ private:
 	bool show_cursors_;
 	std::shared_ptr<CursorPair> cursors_;
 
+	std::list< std::shared_ptr<Flag> > flags_;
+	char next_flag_text_;
+
 	QPoint hover_point_;
 
 	unsigned int sticky_events_;