Change namespace for the trace view and implement ViewBase

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 601e73b163a6ed84683ca8b3bcf9526ab3a8e048..a8d25fc9df6a2ee4dfa5c3cfcfe9b9035e5c9b3a 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -33,7 +33,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const float Ruler::RulerHeight = 2.5f; // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
@@ -128,8 +129,7 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
 void Ruler::paintEvent(QPaintEvent*)
 {
        if (!tick_position_cache_) {
-               auto ffunc = [this](const pv::util::Timestamp& t)
-               {
+               auto ffunc = [this](const pv::util::Timestamp& t) {
                        return format_time_with_distance(
                                this->view_.tick_period(),
                                t,
@@ -226,9 +226,9 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
        return tp;
 }
 
-void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
+void Ruler::mouseDoubleClickEvent(QMouseEvent *event)
 {
-       view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
+       view_.add_flag(view_.offset() + ((double)event->x() + 0.5) * view_.scale());
 }
 
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
@@ -272,5 +272,6 @@ void Ruler::resizeEvent(QResizeEvent*)
        invalidate_tick_position_cache();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv