TabularDecView: Allow return/enter press and don't change scale

[pulseview.git] / pv / views / trace / tracetreeitem.hpp

diff --git a/pv/views/trace/tracetreeitem.hpp b/pv/views/trace/tracetreeitem.hpp
index 7a4bf4622de5bf11cdd45744acceb198d88eca05..e5ebbdd74dc40651d7531ec6f0ba539f0c15430f 100644 (file)
--- a/pv/views/trace/tracetreeitem.hpp
+++ b/pv/views/trace/tracetreeitem.hpp
@@ -17,14 +17,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP
 
 #include <memory>
 
 #include <QPropertyAnimation>
 
-#include "rowitem.hpp"
+#include "viewitem.hpp"
 
 using std::enable_shared_from_this;
 using std::pair;
@@ -35,7 +35,7 @@ namespace trace {
 
 class TraceTreeItemOwner;
 
-class TraceTreeItem : public RowItem,
+class TraceTreeItem : public ViewItem,
        public enable_shared_from_this<TraceTreeItem>
 {
        Q_OBJECT
@@ -94,7 +94,7 @@ public:
         * Sets the owner this trace in the view trace hierachy.
         * @param The new owner of the trace.
         */
-       void set_owner(TraceTreeItemOwner *owner);
+       virtual void set_owner(TraceTreeItemOwner *owner);
 
        /**
         * Gets the visual y-offset of the axis.
@@ -111,7 +111,7 @@ public:
         * Gets the arrow-tip point of the row item marker.
         * @param rect the rectangle of the header area.
         */
-       QPoint point(const QRect &rect) const;
+       QPoint drag_point(const QRect &rect) const;
 
        /**
         * Computes the vertical extents of the contents of this row item.
@@ -133,4 +133,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACETREEITEM_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACETREEITEM_HPP