projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItemOwner: Added depth() method
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 514a3e49694e348dc08123749da90ff0290d1f67..ffdf79a6cce9f29e8bf6d105d65a399a6dd3e124 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-84,15
+84,6
@@
void Header::clear_selection()
update();
}
update();
}
-void Header::signals_updated()
-{
- for (shared_ptr<RowItem> r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(appearance_changed()),
- this, SLOT(on_trace_changed()));
- }
-}
-
void Header::show_popup(const shared_ptr<RowItem> &item)
{
using pv::widgets::Popup;
void Header::show_popup(const shared_ptr<RowItem> &item)
{
using pv::widgets::Popup;
@@
-101,7
+92,7
@@
void Header::show_popup(const shared_ptr<RowItem> &item)
if (!p)
return;
if (!p)
return;
- const QPoint pt(width() - BaselineOffset, item->get_y());
+ const QPoint pt(width() - BaselineOffset, item->get_
visual_
y());
p->set_position(mapToGlobal(pt), Popup::Right);
p->show();
}
p->set_position(mapToGlobal(pt), Popup::Right);
p->show();
}
@@
-118,7
+109,7
@@
void Header::paintEvent(QPaintEvent*)
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->v
_offset() < b->
v_offset(); });
+ return a->v
isual_v_offset() < b->visual_
v_offset(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
@@
-246,7
+237,7
@@
void Header::mouseMoveEvent(QMouseEvent *event)
for (std::shared_ptr<RowItem> r : _view)
if (r->dragging()) {
for (std::shared_ptr<RowItem> r : _view)
if (r->dragging()) {
- r->
set
_v_offset(r->drag_point().y() + delta);
+ r->
force_to
_v_offset(r->drag_point().y() + delta);
// Ensure the trace is selected
r->select();
// Ensure the trace is selected
r->select();
@@
-297,11
+288,5
@@
void Header::on_signals_moved()
update();
}
update();
}
-void Header::on_trace_changed()
-{
- update();
- geometry_updated();
-}
-
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv