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 cd72a179cc72a84e46f4e9e65edb82750da42b0b..a8d25fc9df6a2ee4dfa5c3cfcfe9b9035e5c9b3a 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -33,12 +33,13 @@ 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 float Ruler::RulerHeight = 2.5f; // x Text Height
 const int Ruler::MinorTickSubdivision = 4;
 
-const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
+const float Ruler::HoverArrowSize = 0.5f; // x Text Height
 
 Ruler::Ruler(View &parent) :
        MarginWidget(parent)
@@ -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,
@@ -138,12 +138,12 @@ void Ruler::paintEvent(QPaintEvent*)
                                this->view_.tick_precision());
                };
 
-               tick_position_cache_.emplace(calculate_tick_positions(
+               tick_position_cache_ = calculate_tick_positions(
                        view_.tick_period(),
                        view_.offset(),
                        view_.scale(),
                        width(),
-                       ffunc));
+                       ffunc);
        }
 
        const int ValueMargin = 3;
@@ -198,8 +198,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
 {
        TickPositions tp;
 
-       const double minor_period =
-               (major_period / MinorTickSubdivision).convert_to<double>();
+       const pv::util::Timestamp minor_period = major_period / MinorTickSubdivision;
        const pv::util::Timestamp first_major_division = floor(offset / major_period);
        const pv::util::Timestamp first_minor_division = ceil(offset / minor_period);
        const pv::util::Timestamp t0 = first_major_division * major_period;
@@ -214,7 +213,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions(
                x = ((t - offset) / scale).convert_to<double>();
 
                if (division % MinorTickSubdivision == 0) {
-                       // Recalculate 't' without using 'minor_period' which is of type double.
+                       // Recalculate 't' without using 'minor_period' which is a fraction
                        t = t0 + division / MinorTickSubdivision * major_period;
                        tp.major.emplace_back(x, format_function(t));
                } else {
@@ -227,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)
@@ -273,5 +272,6 @@ void Ruler::resizeEvent(QResizeEvent*)
        invalidate_tick_position_cache();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv