Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 8c136a18189285e3a965af58e49ad0642f002b87..52fcf45612167fa50f2cbc4dffbcd975990a2ef6 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -38,7 +38,8 @@ using std::max;
 using std::min;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int TimeMarker::ArrowSize = 4;
 
@@ -95,11 +96,11 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
        return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
 }
 
-QRectF TimeMarker::hit_box_rect(const QRectF &rect) const
+QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
 {
        const float x = get_x();
        const float h = QFontMetrics(QApplication::font()).height();
-       return QRectF(x - h / 2.0f, rect.top(), h, rect.height());
+       return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
 }
 
 void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -191,5 +192,6 @@ void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
                set_time(value);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv