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

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index c6e585b..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,11 +36,12 @@
 #include <pv/data/signaldata.hpp>
 
 #include "cursorpair.hpp"
+#include "flag.hpp"
 #include "rowitemowner.hpp"
 
 namespace pv {
 
-class SigSession;
+class Session;
 
 namespace view {
 
@@ -53,8 +55,8 @@ class View : public QAbstractScrollArea, public RowItemOwner {
 
 private:
 	enum StickyEvents {
-		SelectableItemHExtentsChanged = 1,
-		SelectableItemVExtentsChanged = 2
+		RowItemHExtentsChanged = 1,
+		RowItemVExtentsChanged = 2
 	};
 
 private:
@@ -63,16 +65,18 @@ private:
 
 	static const int MaxScrollValue;
 
+	static const int ScaleUnits[3];
+
 public:
 	static const QColor CursorAreaColour;
 
 	static const QSizeF LabelPadding;
 
 public:
-	explicit View(SigSession &session, QWidget *parent = 0);
+	explicit View(Session &session, QWidget *parent = 0);
 
-	SigSession& session();
-	const SigSession& session() const;
+	Session& session();
+	const Session& session() const;
 
 	/**
 	 * Returns the view of the owner.
@@ -88,6 +92,11 @@ public:
 
 	const Viewport* viewport() const;
 
+	/**
+	 * Gets a list of time markers.
+	 */
+	std::vector< std::shared_ptr<TimeItem> > time_items() const;
+
 	/**
 	 * Returns the view time scale in seconds per pixel.
 	 */
@@ -100,6 +109,16 @@ public:
 	double offset() const;
 	int owner_visual_v_offset() const;
 
+	/**
+	 * Returns the SI prefix to apply to the graticule time markings.
+	 */
+	unsigned int tick_prefix() const;
+
+	/**
+	 * Returns period of the graticule time markings.
+	 */
+	double tick_period() const;
+
 	/**
 	 * Returns the number of nested parents that this row item owner has.
 	 */
@@ -142,12 +161,22 @@ public:
 	/**
 	 * Returns a reference to the pair of cursors.
 	 */
-	CursorPair& cursors();
+	std::shared_ptr<CursorPair> cursors() const;
 
 	/**
-	 * Returns a reference to the pair of cursors.
+	 * Adds a new flag at a specified time.
 	 */
-	const CursorPair& cursors() const;
+	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;
 
@@ -175,6 +204,12 @@ private:
 	 */
 	void set_zoom(double scale, int offset);
 
+	/**
+	 * Find a tick spacing and number formatting that does not cause
+	 * the values to collide.
+	 */
+	void calculate_tick_spacing();
+
 	void update_scroll();
 
 	void update_layout();
@@ -182,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,
@@ -215,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);
 
@@ -227,8 +261,6 @@ private Q_SLOTS:
 	void signals_changed();
 	void data_updated();
 
-	void marker_time_changed();
-
 	void on_signals_moved();
 
 	void process_sticky_events();
@@ -236,7 +268,7 @@ private Q_SLOTS:
 	void on_hover_point_changed();
 
 private:
-	SigSession &session_;
+	Session &session_;
 
 	Viewport *viewport_;
 	Ruler *ruler_;
@@ -252,8 +284,14 @@ private:
 	int v_offset_;
 	bool updating_scroll_;
 
+	double tick_period_;
+	unsigned int tick_prefix_;
+
 	bool show_cursors_;
-	CursorPair cursors_;
+	std::shared_ptr<CursorPair> cursors_;
+
+	std::list< std::shared_ptr<Flag> > flags_;
+	char next_flag_text_;
 
 	QPoint hover_point_;