X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Frowitem.h;h=f2e6a66ec87bf6b6c460777d2a65ed832d260757;hb=14ca8a8deb6fe6d96567aa11a669dce68af67885;hp=6b23162f5808a56c8526115fdfe2c8a7b7fb0b5d;hpb=0dda6fe595932b2e340930104fad8ac4fc574895;p=pulseview.git

diff --git a/pv/view/rowitem.h b/pv/view/rowitem.h
index 6b23162f..f2e6a66e 100644
--- a/pv/view/rowitem.h
+++ b/pv/view/rowitem.h
@@ -21,6 +21,10 @@
 #ifndef PULSEVIEW_PV_VIEW_HEADERITEM_H
 #define PULSEVIEW_PV_VIEW_HEADERITEM_H
 
+#include <memory>
+
+#include <QPropertyAnimation>
+
 #include "selectableitem.h"
 
 namespace pv {
@@ -28,9 +32,13 @@ namespace view {
 
 class RowItemOwner;
 
-class RowItem : public SelectableItem
+class RowItem : public SelectableItem,
+	public std::enable_shared_from_this<pv::view::RowItem>
 {
 	Q_OBJECT
+	Q_PROPERTY(int visual_v_offset
+		READ visual_v_offset
+		WRITE set_visual_v_offset)
 
 public:
 	/**
@@ -46,12 +54,33 @@ public:
 	/**
 	 * Gets the vertical layout offset of this signal.
 	 */
-	int v_offset() const;
+	int layout_v_offset() const;
 
 	/**
 	 * Sets the vertical layout offset of this signal.
 	 */
-	void set_v_offset(int v_offset);
+	void set_layout_v_offset(int v_offset);
+
+	/**
+	 * Gets the vertical visual offset of this signal.
+	 */
+	int visual_v_offset() const;
+
+	/**
+	 * Sets the vertical visual offset of this signal.
+	 */
+	void set_visual_v_offset(int v_offset);
+
+	/**
+	 * Sets the visual and layout offset of this signal.
+	 */
+	void force_to_v_offset(int v_offset);
+
+	/**
+	 * Begins an animation that will animate the visual offset toward
+	 * the layout offset.
+	 */
+	void animate_to_layout_v_offset();
 
 	/**
 	 * Gets the owner this trace in the view trace hierachy.
@@ -65,15 +94,21 @@ public:
 	void set_owner(pv::view::RowItemOwner *owner);
 
 	/**
-	 * Gets the y-offset of the axis.
+	 * Gets the visual y-offset of the axis.
 	 */
-	int get_y() const;
+	int get_visual_y() const;
 
 	/**
 	 * Gets the drag point of the row item.
 	 */
 	QPoint point() const;
 
+	/**
+	 * Computes the vertical extents of the contents of this row item.
+	 * @return A pair containing the minimum and maximum y-values.
+	 */
+	virtual std::pair<int, int> v_extents() const = 0;
+
 	/**
 	 * Paints the background layer of the trace with a QPainter
 	 * @param p the QPainter to paint into.
@@ -118,13 +153,14 @@ public:
 public:
 	virtual void hover_point_changed();
 
-Q_SIGNALS:
-	void appearance_changed();
-
 protected:
 	pv::view::RowItemOwner *_owner;
 
-	int _v_offset;
+	int _layout_v_offset;
+	int _visual_v_offset;
+
+private:
+	QPropertyAnimation _v_offset_animation;
 };
 
 } // namespace view