X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=0352864500d659152dfd738444d30e8aba02ca38;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hp=83a6fe2d2a4d318288f084920e07f5c3c963e25a;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 83a6fe2..0352864 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -33,6 +33,7 @@
 #include <pv/data/signaldata.h>
 
 #include "cursorpair.h"
+#include "rowitemowner.h"
 
 namespace pv {
 
@@ -40,12 +41,12 @@ class SigSession;
 
 namespace view {
 
+class CursorHeader;
 class Header;
 class Ruler;
-class Trace;
 class Viewport;
 
-class View : public QAbstractScrollArea {
+class View : public QAbstractScrollArea, public RowItemOwner {
 	Q_OBJECT
 
 private:
@@ -55,10 +56,6 @@ private:
 	static const int MaxScrollValue;
 
 public:
-	static const int SignalHeight;
-	static const int SignalMargin;
-	static const int SignalSnapGridSize;
-
 	static const QColor CursorAreaColour;
 
 	static const QSizeF LabelPadding;
@@ -69,6 +66,20 @@ public:
 	SigSession& session();
 	const SigSession& session() const;
 
+	/**
+	 * Returns the view of the owner.
+	 */
+	virtual pv::view::View* view();
+
+	/**
+	 * Returns the view of the owner.
+	 */
+	virtual const pv::view::View* view() const;
+
+	Viewport* viewport();
+
+	const Viewport* viewport() const;
+
 	/**
 	 * Returns the view time scale in seconds per pixel.
 	 */
@@ -79,7 +90,7 @@ public:
 	 * seconds.
 	 */
 	double offset() const;
-	int v_offset() const;
+	int owner_v_offset() const;
 
 	void zoom(double steps);
 	void zoom(double steps, int offset);
@@ -95,10 +106,6 @@ public:
 	 */
 	void set_scale_offset(double scale, double offset);
 
-	std::vector< std::shared_ptr<Trace> > get_traces() const;
-
-	std::list<std::weak_ptr<SelectableItem> > selected_items() const;
-
 	std::set< std::shared_ptr<pv::data::SignalData> >
 		get_visible_data() const;
 
@@ -135,7 +142,7 @@ public:
 
 	void update_viewport();
 
-signals:
+Q_SIGNALS:
 	void hover_point_changed();
 
 	void signals_moved();
@@ -159,9 +166,22 @@ private:
 
 	void update_layout();
 
-	static bool compare_trace_v_offsets(
-		const std::shared_ptr<pv::view::Trace> &a,
-		const std::shared_ptr<pv::view::Trace> &b);
+	/**
+	 * Satisifies RowItem functionality.
+	 * @param p the QPainter to paint into.
+	 * @param right the x-coordinate of the right edge 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);
+
+	/**
+	 * Computes the outline rectangle of a label.
+	 * @param right the x-coordinate of the right edge of the header
+	 * 	area.
+	 * @return Returns the rectangle of the signal label.
+	 */
+	QRectF label_rect(int right);
 
 private:
 	bool eventFilter(QObject *object, QEvent *event);
@@ -170,7 +190,7 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 
-private slots:
+private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed(int value);
@@ -184,11 +204,14 @@ private slots:
 
 	void on_geometry_updated();
 
+	void on_hover_point_changed();
+
 private:
 	SigSession &_session;
 
 	Viewport *_viewport;
 	Ruler *_ruler;
+	CursorHeader *_cursorheader;
 	Header *_header;
 
 	/// The view time scale in seconds per pixel.