projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge RowItem() into ViewItem()
[pulseview.git]
/
pv
/
views
/
trace
/
header.cpp
diff --git
a/pv/views/trace/header.cpp
b/pv/views/trace/header.cpp
index fd2d85e227c4b70e82ecfcf415b7da9a5f0f4816..1e97521afd7d7b41481eb1b259fc5e8df3e770bf 100644
(file)
--- a/
pv/views/trace/header.cpp
+++ b/
pv/views/trace/header.cpp
@@
-99,16
+99,16
@@
void Header::paintEvent(QPaintEvent*)
{
const QRect rect(0, 0, width(), height());
{
const QRect rect(0, 0, width(), height());
- vector< shared_ptr<
RowItem> > items(view_.list_by_type<Ro
wItem>());
+ vector< shared_ptr<
ViewItem> > items(view_.list_by_type<Vie
wItem>());
stable_sort(items.begin(), items.end(),
stable_sort(items.begin(), items.end(),
- [](const shared_ptr<
RowItem> &a, const shared_ptr<Ro
wItem> &b) {
+ [](const shared_ptr<
ViewItem> &a, const shared_ptr<Vie
wItem> &b) {
return a->drag_point(QRect()).y() < b->drag_point(QRect()).y(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
return a->drag_point(QRect()).y() < b->drag_point(QRect()).y(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- for (const shared_ptr<
RowItem>
r : items) {
+ for (const shared_ptr<
ViewItem>&
r : items) {
assert(r);
const bool highlight = !item_dragging_ &&
assert(r);
const bool highlight = !item_dragging_ &&
@@
-201,7
+201,7
@@
void Header::on_ungroup()
restart = false;
const vector< shared_ptr<TraceGroup> > groups(
view_.list_by_type<TraceGroup>());
restart = false;
const vector< shared_ptr<TraceGroup> > groups(
view_.list_by_type<TraceGroup>());
- for (const shared_ptr<TraceGroup> tg : groups)
+ for (const shared_ptr<TraceGroup>
&
tg : groups)
if (tg->selected()) {
tg->ungroup();
restart = true;
if (tg->selected()) {
tg->ungroup();
restart = true;