X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Frowitem.h;h=db6e580d0a221c44e848a6f527c45036cb9e6b2e;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=161e828917aec9ea8acb98ad8550898fd252c7c8;hpb=6dcdb3258f6f0b25e69154b5919405a194b7e724;p=pulseview.git

diff --git a/pv/view/rowitem.h b/pv/view/rowitem.h
index 161e828..db6e580 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,9 +94,20 @@ 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_visual_y() const;
+
+	/**
+	 * Gets the drag point of the row item.
 	 */
-	int get_y() const;
+	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
@@ -113,13 +153,14 @@ public:
 public:
 	virtual void hover_point_changed();
 
-Q_SIGNALS:
-	void appearance_changed();
-
 protected:
-	pv::view::RowItemOwner *_owner;
+	pv::view::RowItemOwner *owner_;
+
+	int layout_v_offset_;
+	int visual_v_offset_;
 
-	int _v_offset;
+private:
+	QPropertyAnimation v_offset_animation_;
 };
 
 } // namespace view