X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Frowitem.hpp;h=d2e2dd99ee1b824b8ce07cd4d4013a9bbda381c0;hp=4f973e3fc218647d355fcede1492d45fe0a3725c;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=096fb584db59a7b95ea57a6accf6c282a43497f6

diff --git a/pv/view/rowitem.hpp b/pv/view/rowitem.hpp
index 4f973e3f..d2e2dd99 100644
--- a/pv/view/rowitem.hpp
+++ b/pv/view/rowitem.hpp
@@ -18,145 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_HEADERITEM_H
-#define PULSEVIEW_PV_VIEW_HEADERITEM_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ROWITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ROWITEM_HPP
 
-#include <memory>
-
-#include <QPropertyAnimation>
-
-#include "rowitempaintparams.hpp"
-#include "selectableitem.hpp"
+#include <pv/view/viewitem.hpp>
 
 namespace pv {
-namespace view {
-
-class RowItemOwner;
+namespace views {
+namespace TraceView {
 
-class RowItem : public SelectableItem,
-	public std::enable_shared_from_this<pv::view::RowItem>
+class RowItem : public ViewItem
 {
 	Q_OBJECT
-	Q_PROPERTY(int visual_v_offset
-		READ visual_v_offset
-		WRITE set_visual_v_offset)
-
-public:
-	/**
-	 * Constructor.
-	 */
-	RowItem();
-
-	/**
-	 * Gets the vertical layout offset of this signal.
-	 */
-	int layout_v_offset() const;
-
-	/**
-	 * Sets the vertical layout offset of this signal.
-	 */
-	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.
-	 */
-	pv::view::RowItemOwner* owner() const;
-
-	/**
-	 * Sets the owner this trace in the view trace hierachy.
-	 * @param The new owner of the trace.
-	 */
-	void set_owner(pv::view::RowItemOwner *owner);
-
-	/**
-	 * Gets the visual y-offset of the axis.
-	 */
-	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.
-	 * @param pp the painting parameters object to paint with.
-	 **/
-	virtual void paint_back(QPainter &p, const RowItemPaintParams &pp);
-
-	/**
-	 * Paints the mid-layer of the trace with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param pp the painting parameters object to paint with.
-	 **/
-	virtual void paint_mid(QPainter &p, const RowItemPaintParams &pp);
-
-	/**
-	 * Paints the foreground layer of the trace with a QPainter
-	 * @param p the QPainter to paint into.
-	 * @param pp the painting parameters object to paint with.
-	 **/
-	virtual void paint_fore(QPainter &p, const RowItemPaintParams &pp);
-
-	/**
-	 * Paints the signal label.
-	 * @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.
-	 */
-	virtual void paint_label(QPainter &p, int right, bool hover) = 0;
-
-	/**
-	 * 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.
-	 */
-	virtual QRectF label_rect(int right) const = 0;
 
 public:
 	virtual void hover_point_changed();
-
-protected:
-	pv::view::RowItemOwner *owner_;
-
-	int layout_v_offset_;
-	int visual_v_offset_;
-
-private:
-	QPropertyAnimation v_offset_animation_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_HEADERITEM_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ROWITEM_HPP