X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=a8d25fc9df6a2ee4dfa5c3cfcfe9b9035e5c9b3a;hp=393af57711c699732c84cfd05c1ee9933dff0f6d;hb=2d25fc473d6dc5d578f45f8d6bb061639afec405;hpb=7c6cbdda4d7beaaf41c752826091b407a203df51 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index 393af577..a8d25fc9 100644 --- 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 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