X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftracegroup.cpp;h=5abcc86a5ec9d3253581a6da6d2c948f95bbb8c5;hp=140b85187efef4f2309837db938db75a6de82dce;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=c373f82810ad9c5376a7370118de9dd587ee0e43 diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp index 140b8518..5abcc86a 100644 --- a/pv/view/tracegroup.cpp +++ b/pv/view/tracegroup.cpp @@ -33,7 +33,8 @@ using std::shared_ptr; using std::vector; namespace pv { -namespace view { +namespace views { +namespace TraceView { const int TraceGroup::Padding = 8; const int TraceGroup::Width = 12; @@ -64,13 +65,13 @@ const pv::Session& TraceGroup::session() const return owner_->session(); } -pv::view::View* TraceGroup::view() +View* TraceGroup::view() { assert(owner_); return owner_->view(); } -const pv::view::View* TraceGroup::view() const +const View* TraceGroup::view() const { assert(owner_); return owner_->view(); @@ -164,7 +165,7 @@ void TraceGroup::restack_items() [](const shared_ptr &a, const shared_ptr &b) { const auto aext = a->v_extents(); const auto bext = b->v_extents(); - return a->layout_v_offset() + + return a->layout_v_offset() + (aext.first + aext.second) / 2 < b->layout_v_offset() + (bext.first + bext.second) / 2; @@ -222,5 +223,6 @@ void TraceGroup::extents_changed(bool horz, bool vert) owner_->extents_changed(horz, vert); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv