projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ViewItemOwner
[pulseview.git]
/
pv
/
view
/
tracegroup.cpp
diff --git
a/pv/view/tracegroup.cpp
b/pv/view/tracegroup.cpp
index 87f1ff3dcab20fac2c065a5daadb0525534e56f8..140b85187efef4f2309837db938db75a6de82dce 100644
(file)
--- a/
pv/view/tracegroup.cpp
+++ b/
pv/view/tracegroup.cpp
@@
-49,7
+49,7
@@
TraceGroup::~TraceGroup()
bool TraceGroup::enabled() const
{
return std::any_of(child_items().begin(), child_items().end(),
bool TraceGroup::enabled() const
{
return std::any_of(child_items().begin(), child_items().end(),
- [](const shared_ptr<
TraceTree
Item> &r) { return r->enabled(); });
+ [](const shared_ptr<
View
Item> &r) { return r->enabled(); });
}
pv::Session& TraceGroup::session()
}
pv::Session& TraceGroup::session()
@@
-115,7
+115,7
@@
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
QRectF TraceGroup::label_rect(const QRectF &rect) const
{
QRectF child_rect;
QRectF TraceGroup::label_rect(const QRectF &rect) const
{
QRectF child_rect;
- for (const shared_ptr<
TraceTree
Item> r : child_items())
+ for (const shared_ptr<
View
Item> r : child_items())
if (r && r->enabled())
child_rect = child_rect.united(r->label_rect(rect));
if (r && r->enabled())
child_rect = child_rect.united(r->label_rect(rect));
@@
-157,8
+157,7
@@
int TraceGroup::owner_visual_v_offset() const
void TraceGroup::restack_items()
{
void TraceGroup::restack_items()
{
- vector< shared_ptr<TraceTreeItem> > items(
- child_items().begin(), child_items().end());
+ vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
// Sort by the centre line of the extents
stable_sort(items.begin(), items.end(),
// Sort by the centre line of the extents
stable_sort(items.begin(), items.end(),
@@
-197,8
+196,7
@@
unsigned int TraceGroup::depth() const
void TraceGroup::ungroup()
{
void TraceGroup::ungroup()
{
- const vector< shared_ptr<TraceTreeItem> > items(
- child_items().begin(), child_items().end());
+ const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
clear_child_items();
for (shared_ptr<TraceTreeItem> r : items)
clear_child_items();
for (shared_ptr<TraceTreeItem> r : items)