projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use static signal offsets instead of offsets calculated on-the-fly
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 2f02e7744782e330107c2484bd116536d0e7f506..125d3c2430ba868d95c0f535e162d9279dda9e90 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-64,18
+64,17
@@
void Header::paintEvent(QPaintEvent *event)
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
-
int offset = -
_view.v_offset();
+
const int v_offset =
_view.v_offset();
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
const QRect signal_heading_rect(
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
const QRect signal_heading_rect(
- 0, offset, w, View::SignalHeight);
+ 0, s->get_v_offset() - v_offset,
+ w, View::SignalHeight);
s->paint_label(painter, signal_heading_rect,
s->pt_in_label_rect(signal_heading_rect, _mouse_point));
s->paint_label(painter, signal_heading_rect,
s->pt_in_label_rect(signal_heading_rect, _mouse_point));
-
- offset += View::SignalHeight;
}
painter.end();
}
painter.end();
@@
-100,13
+99,14
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
const vector< shared_ptr<Signal> > &sigs =
_view.session().get_signals();
const vector< shared_ptr<Signal> > &sigs =
_view.session().get_signals();
-
int offset = -
_view.v_offset();
+
const int v_offset =
_view.v_offset();
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
const QRect signal_heading_rect(
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
const QRect signal_heading_rect(
- 0, offset, w, View::SignalHeight);
+ 0, s->get_v_offset() - v_offset,
+ w, View::SignalHeight);
if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) {
QMenu menu(this);
if(s->pt_in_label_rect(signal_heading_rect, _mouse_point)) {
QMenu menu(this);
@@
-119,8
+119,6
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
break;
}
break;
}
-
- offset += View::SignalHeight;
}
}
}
}