X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=bff63c762135e2b402941a856118b7097cc77079;hb=eae3bbbbfd35aef309c186e278ff7ab2d90f362a;hp=b570c0386c3ef556e4e9cd41927749e212fcb5b6;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp index b570c038..bff63c76 100644 --- a/pv/view/tracetreeitemowner.cpp +++ b/pv/view/tracetreeitemowner.cpp @@ -20,15 +20,14 @@ #include #include "tracetreeitem.hpp" -#include "tracetreeitemowner.hpp" #include "trace.hpp" +#include "tracetreeitemowner.hpp" -using std::dynamic_pointer_cast; -using std::max; +using std::find; using std::make_pair; +using std::max; using std::min; using std::pair; -using std::set; using std::shared_ptr; using std::static_pointer_cast; using std::vector; @@ -42,7 +41,7 @@ const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const return items_; } -vector< std::shared_ptr > +vector< shared_ptr > TraceTreeItemOwner::trace_tree_child_items() const { vector< shared_ptr > items; @@ -65,7 +64,7 @@ void TraceTreeItemOwner::clear_child_items() items_.clear(); } -void TraceTreeItemOwner::add_child_item(std::shared_ptr item) +void TraceTreeItemOwner::add_child_item(shared_ptr item) { assert(!item->owner()); item->set_owner(this); @@ -74,11 +73,11 @@ void TraceTreeItemOwner::add_child_item(std::shared_ptr item) extents_changed(true, true); } -void TraceTreeItemOwner::remove_child_item(std::shared_ptr item) +void TraceTreeItemOwner::remove_child_item(shared_ptr item) { assert(item->owner() == this); item->set_owner(nullptr); - auto iter = std::find(items_.begin(), items_.end(), item); + auto iter = find(items_.begin(), items_.end(), item); assert(iter != items_.end()); items_.erase(iter); @@ -111,23 +110,6 @@ pair TraceTreeItemOwner::v_extents() const return extents; } -bool TraceTreeItemOwner::reassign_bgcolour_states(bool next_bgcolour_state) -{ - vector< shared_ptr > items = trace_tree_child_items(); - - // Sort items according to vertical position - sort(items.begin(), items.end(), - [](const shared_ptr a, const shared_ptr b) { - return a->layout_v_offset() > b->layout_v_offset(); }); - - for (const shared_ptr item : items) { - item->set_bgcolour_state(next_bgcolour_state); - next_bgcolour_state = !next_bgcolour_state; - } - - return next_bgcolour_state; -} - void TraceTreeItemOwner::restack_items() { }