X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=9c7c13bcd3801089d5838c51ceb994cadfc4841f;hb=ec39632d1267a42cb858ac6ad7c98486886a46a0;hp=59d51d18e09fbf4efe0bb5ea7960b00f8b6343d3;hpb=76fea660eea8a2e1963b4703906392a0999669d0;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 59d51d1..9c7c13b 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);
 
@@ -161,6 +158,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();
@@ -231,7 +243,8 @@ private:
 	void resizeEvent(QResizeEvent *e);
 
 public:
-	void appearance_changed(bool label, bool content);
+	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);
 
@@ -243,8 +256,6 @@ private Q_SLOTS:
 	void signals_changed();
 	void data_updated();
 
-	void marker_time_changed();
-
 	void on_signals_moved();
 
 	void process_sticky_events();
@@ -256,7 +267,6 @@ private:
 
 	Viewport *viewport_;
 	Ruler *ruler_;
-	CursorHeader *cursorheader_;
 	Header *header_;
 
 	/// The view time scale in seconds per pixel.
@@ -274,6 +284,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_;