X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=07bd5d9caeade08c0f75b90da5003c423f8dde7a;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hp=85e990f7464660fe596635f2b41018cc5527bdca;hpb=84a0d458a4b04141dd45af6dec44d36782ee163e;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 85e990f7..07bd5d9c 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 {
 
@@ -43,10 +44,9 @@ 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:
@@ -56,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;
@@ -70,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.
 	 */
@@ -80,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);
@@ -96,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;
 
@@ -132,11 +138,9 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void normalize_layout();
-
 	void update_viewport();
 
-signals:
+Q_SIGNALS:
 	void hover_point_changed();
 
 	void signals_moved();
@@ -160,9 +164,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);
@@ -171,7 +188,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);
@@ -185,6 +202,8 @@ private slots:
 
 	void on_geometry_updated();
 
+	void on_hover_point_changed();
+
 private:
 	SigSession &_session;