X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftracetreeitemowner.cpp;h=bff63c762135e2b402941a856118b7097cc77079;hb=303eec78f3c499cd30fc88b282aa1f336e82a806;hp=528e0a033fb3aaec8d6477f1785edea050897328;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 528e0a0..bff63c7 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -14,22 +14,20 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#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;
@@ -43,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;
@@ -66,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);
@@ -75,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);
@@ -112,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()
{
}