#include <QMenu>
#include <QPainter>
-#include "tracegroup.h"
+#include "tracegroup.hpp"
using std::pair;
using std::shared_ptr;
TraceGroup::~TraceGroup()
{
- _owner = nullptr;
+ owner_ = nullptr;
clear_child_items();
}
bool TraceGroup::enabled() const
{
return std::any_of(child_items().begin(), child_items().end(),
- [](const shared_ptr<RowItem> &r) { return r->enabled(); });
+ [](const shared_ptr<ViewItem> &r) { return r->enabled(); });
}
-pv::SigSession& TraceGroup::session()
+pv::Session& TraceGroup::session()
{
- assert(_owner);
- return _owner->session();
+ assert(owner_);
+ return owner_->session();
}
-const pv::SigSession& TraceGroup::session() const
+const pv::Session& TraceGroup::session() const
{
- assert(_owner);
- return _owner->session();
+ assert(owner_);
+ return owner_->session();
}
pv::view::View* TraceGroup::view()
{
- assert(_owner);
- return _owner->view();
+ assert(owner_);
+ return owner_->view();
}
const pv::view::View* TraceGroup::view() const
{
- assert(_owner);
- return _owner->view();
+ assert(owner_);
+ return owner_->view();
}
pair<int, int> TraceGroup::v_extents() const
{
- return RowItemOwner::v_extents();
+ return TraceTreeItemOwner::v_extents();
}
-void TraceGroup::paint_label(QPainter &p, int right, bool hover)
+void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
{
- const QRectF r = label_rect(right).adjusted(
+ const QRectF r = label_rect(rect).adjusted(
LineThickness / 2, LineThickness / 2,
-LineThickness / 2, -LineThickness / 2);
p.drawPolyline(points, countof(points));
}
-QRectF TraceGroup::label_rect(int right) const
+QRectF TraceGroup::label_rect(const QRectF &rect) const
{
- QRectF rect;
- for (const shared_ptr<RowItem> r : child_items())
- if (r)
- rect = rect.united(r->label_rect(right));
+ QRectF child_rect;
+ for (const shared_ptr<ViewItem> r : child_items())
+ if (r && r->enabled())
+ child_rect = child_rect.united(r->label_rect(rect));
- return QRectF(rect.x() - Width - Padding, rect.y(),
- Width, rect.height());
+ return QRectF(child_rect.x() - Width - Padding, child_rect.y(),
+ Width, child_rect.height());
}
bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)
pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
{
(void)parent;
- return NULL;
+ return nullptr;
}
-int TraceGroup::owner_v_offset() const
+int TraceGroup::owner_visual_v_offset() const
{
- return _owner ? layout_v_offset() + _owner->owner_v_offset() : 0;
+ return owner_ ? visual_v_offset() + owner_->owner_visual_v_offset() : 0;
+}
+
+void TraceGroup::restack_items()
+{
+ vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
+
+ // Sort by the centre line of the extents
+ stable_sort(items.begin(), items.end(),
+ [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
+ const auto aext = a->v_extents();
+ const auto bext = b->v_extents();
+ return a->layout_v_offset() +
+ (aext.first + aext.second) / 2 <
+ b->layout_v_offset() +
+ (bext.first + bext.second) / 2;
+ });
+
+ int total_offset = 0;
+ for (shared_ptr<TraceTreeItem> r : items) {
+ const pair<int, int> extents = r->v_extents();
+ if (extents.first == 0 && extents.second == 0)
+ continue;
+
+ // We position disabled traces, so that they are close to the
+ // animation target positon should they be re-enabled
+ if (r->enabled())
+ total_offset += -extents.first;
+
+ if (!r->dragging())
+ r->set_layout_v_offset(total_offset);
+
+ if (r->enabled())
+ total_offset += extents.second;
+ }
}
unsigned int TraceGroup::depth() const
{
- return _owner ? _owner->depth() + 1 : 0;
+ return owner_ ? owner_->depth() + 1 : 0;
}
-void TraceGroup::on_ungroup()
+void TraceGroup::ungroup()
{
- const vector< shared_ptr<RowItem> > items(
- child_items().begin(), child_items().end());
+ const vector<shared_ptr<TraceTreeItem>> items(trace_tree_child_items());
clear_child_items();
- for (shared_ptr<RowItem> r : items)
- _owner->add_child_item(r);
+ for (shared_ptr<TraceTreeItem> r : items)
+ owner_->add_child_item(r);
- _owner->remove_child_item(shared_from_this());
+ owner_->remove_child_item(shared_from_this());
+}
+
+void TraceGroup::on_ungroup()
+{
+ ungroup();
}
-void TraceGroup::appearance_changed(bool label, bool content)
+void TraceGroup::row_item_appearance_changed(bool label, bool content)
{
- if (_owner)
- _owner->appearance_changed(label, content);
+ if (owner_)
+ owner_->row_item_appearance_changed(label, content);
}
void TraceGroup::extents_changed(bool horz, bool vert)
{
- if (_owner)
- _owner->extents_changed(horz, vert);
+ if (owner_)
+ owner_->extents_changed(horz, vert);
}
} // namespace view