X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=6b7841f926ed105450a6181fe199e2b3eb2ed222;hb=8914fe790fb677c56194a3ae4da06ba671fca78a;hp=026c7683ffaef224c501ed94ad6cdbe586452742;hpb=5c5ce7574062e0d3ad4f7d9dde70b482315d54fb;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 026c768..6b7841f 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 {
@@ -53,8 +55,8 @@ class View : public QAbstractScrollArea, public RowItemOwner {
 
 private:
 	enum StickyEvents {
-		SelectableItemHExtentsChanged = 1,
-		SelectableItemVExtentsChanged = 2
+		RowItemHExtentsChanged = 1,
+		RowItemVExtentsChanged = 2
 	};
 
 private:
@@ -161,6 +163,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();
@@ -200,19 +217,17 @@ private:
 	/**
 	 * Satisifies RowItem functionality.
 	 * @param p the QPainter to paint into.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @param hover true if the label is being hovered over by the mouse.
 	 */
-	void paint_label(QPainter &p, int right, bool hover);
+	void paint_label(QPainter &p, const QRect &rect, bool hover);
 
 	/**
 	 * Computes the outline rectangle of a label.
-	 * @param right the x-coordinate of the right edge of the header
-	 * 	area.
+	 * @param rect the rectangle of the header area.
 	 * @return Returns the rectangle of the signal label.
 	 */
-	QRectF label_rect(int right);
+	QRectF label_rect(const QRectF &rect);
 
 	static bool add_channels_to_owner(
 		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
@@ -233,7 +248,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);
 
@@ -245,8 +261,6 @@ private Q_SLOTS:
 	void signals_changed();
 	void data_updated();
 
-	void marker_time_changed();
-
 	void on_signals_moved();
 
 	void process_sticky_events();
@@ -276,6 +290,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_;