projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move run/stop button from the menu bar to the tab widget
[pulseview.git]
/
pv
/
view
/
tracegroup.cpp
diff --git
a/pv/view/tracegroup.cpp
b/pv/view/tracegroup.cpp
index 13ba025f9c1235ed01576fe736812e963c73ad79..5abcc86a5ec9d3253581a6da6d2c948f95bbb8c5 100644
(file)
--- a/
pv/view/tracegroup.cpp
+++ b/
pv/view/tracegroup.cpp
@@
-33,7
+33,8
@@
using std::shared_ptr;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
@@
-49,7
+50,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<
Ro
wItem> &r) { return r->enabled(); });
+ [](const shared_ptr<
Vie
wItem> &r) { return r->enabled(); });
}
pv::Session& TraceGroup::session()
}
pv::Session& TraceGroup::session()
@@
-64,13
+65,13
@@
const pv::Session& TraceGroup::session() const
return owner_->session();
}
return owner_->session();
}
-
pv::view::
View* TraceGroup::view()
+View* TraceGroup::view()
{
assert(owner_);
return owner_->view();
}
{
assert(owner_);
return owner_->view();
}
-const
pv::view::
View* TraceGroup::view() const
+const View* TraceGroup::view() const
{
assert(owner_);
return owner_->view();
{
assert(owner_);
return owner_->view();
@@
-78,7
+79,7
@@
const pv::view::View* TraceGroup::view() const
pair<int, int> TraceGroup::v_extents() const
{
pair<int, int> TraceGroup::v_extents() const
{
- return
Row
ItemOwner::v_extents();
+ return
TraceTree
ItemOwner::v_extents();
}
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
}
void TraceGroup::paint_label(QPainter &p, const QRect &rect, bool hover)
@@
-115,7
+116,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<
Ro
wItem> r : child_items())
+ for (const shared_ptr<
Vie
wItem> 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));
@@
-147,7
+148,7
@@
QMenu* TraceGroup::create_context_menu(QWidget *parent)
pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
{
(void)parent;
pv::widgets::Popup* TraceGroup::create_popup(QWidget *parent)
{
(void)parent;
- return
NULL
;
+ return
nullptr
;
}
int TraceGroup::owner_visual_v_offset() const
}
int TraceGroup::owner_visual_v_offset() const
@@
-157,22
+158,21
@@
int TraceGroup::owner_visual_v_offset() const
void TraceGroup::restack_items()
{
void TraceGroup::restack_items()
{
- vector< shared_ptr<RowItem> > 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(),
- [](const shared_ptr<
RowItem> &a, const shared_ptr<Row
Item> &b) {
+ [](const shared_ptr<
TraceTreeItem> &a, const shared_ptr<TraceTree
Item> &b) {
const auto aext = a->v_extents();
const auto bext = b->v_extents();
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;
});
int total_offset = 0;
(aext.first + aext.second) / 2 <
b->layout_v_offset() +
(bext.first + bext.second) / 2;
});
int total_offset = 0;
- for (shared_ptr<
Row
Item> r : items) {
+ for (shared_ptr<
TraceTree
Item> r : items) {
const pair<int, int> extents = r->v_extents();
if (extents.first == 0 && extents.second == 0)
continue;
const pair<int, int> extents = r->v_extents();
if (extents.first == 0 && extents.second == 0)
continue;
@@
-197,11
+197,10
@@
unsigned int TraceGroup::depth() const
void TraceGroup::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();
clear_child_items();
- for (shared_ptr<
Row
Item> r : items)
+ for (shared_ptr<
TraceTree
Item> r : items)
owner_->add_child_item(r);
owner_->remove_child_item(shared_from_this());
owner_->add_child_item(r);
owner_->remove_child_item(shared_from_this());
@@
-212,10
+211,10
@@
void TraceGroup::on_ungroup()
ungroup();
}
ungroup();
}
-void TraceGroup::appearance_changed(bool label, bool content)
+void TraceGroup::
row_item_
appearance_changed(bool label, bool content)
{
if (owner_)
{
if (owner_)
- owner_->appearance_changed(label, content);
+ owner_->
row_item_
appearance_changed(label, content);
}
void TraceGroup::extents_changed(bool horz, bool vert)
}
void TraceGroup::extents_changed(bool horz, bool vert)
@@
-224,5
+223,6
@@
void TraceGroup::extents_changed(bool horz, bool vert)
owner_->extents_changed(horz, vert);
}
owner_->extents_changed(horz, vert);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv