Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / view / viewitem.cpp

diff --git a/pv/view/viewitem.cpp b/pv/view/viewitem.cpp
index 6ad6f6b64fbb515eb3426e13d3806754e8f862cc..7e581d952bcd00d8cc3f2ec4dd491fd74e5d24fb 100644 (file)
--- a/pv/view/viewitem.cpp
+++ b/pv/view/viewitem.cpp
@@ -27,7 +27,8 @@
 #include <QPalette>
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QSizeF ViewItem::LabelPadding(4, 0);
 const int ViewItem::HighlightRadius = 3;
@@ -49,6 +50,11 @@ void ViewItem::select(bool select)
        selected_ = select;
 }
 
+bool ViewItem::is_draggable() const
+{
+       return true;
+}
+
 bool ViewItem::dragging() const
 {
        return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
@@ -56,7 +62,8 @@ bool ViewItem::dragging() const
 
 void ViewItem::drag()
 {
-       drag_point_ = point(QRect());
+       if (is_draggable())
+               drag_point_ = point(QRect());
 }
 
 void ViewItem::drag_release()
@@ -70,9 +77,9 @@ QRectF ViewItem::label_rect(const QRectF &rect) const
        return QRectF();
 }
 
-QRectF ViewItem::hit_box_rect(const QRectF &rect) const
+QRectF ViewItem::hit_box_rect(const ViewItemPaintParams &pp) const
 {
-       (void)rect;
+       (void)pp;
        return QRectF();
 }
 
@@ -129,5 +136,6 @@ QColor ViewItem::select_text_colour(QColor background)
        return (background.lightness() > 110) ? Qt::black : Qt::white;
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv