projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Probes popup now live applies properly
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 0e0ae8ae4ad0807f5b99abe1f31ca458f437af94..a06c8888761f6c1237ffde3c5aecc8ceb2ff5df1 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-42,6
+42,9
@@
Viewport::Viewport(View &parent) :
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
+ connect(&_view.session(), SIGNAL(signals_changed()),
+ this, SLOT(on_signals_changed()));
+
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
@@
-69,14
+72,18
@@
void Viewport::paintEvent(QPaintEvent*)
_view.cursors().draw_viewport_background(p, rect());
// Plot the signal
_view.cursors().draw_viewport_background(p, rect());
// Plot the signal
- const int v_offset = _view.v_offset();
BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
assert(t);
BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
assert(t);
- t->paint(p, t->get_v_offset() - v_offset, 0, width(),
- _view.scale(), _view.offset());
+ t->paint_back(p, 0, width());
}
}
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+ t->paint_mid(p, 0, width());
+
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+ t->paint_fore(p, 0, width());
+
if (_view.cursors_shown())
_view.cursors().draw_viewport_foreground(p, rect());
if (_view.cursors_shown())
_view.cursors().draw_viewport_foreground(p, rect());
@@
-119,6
+126,16
@@
void Viewport::wheelEvent(QWheelEvent *event)
}
}
}
}
+void Viewport::on_signals_changed()
+{
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+ assert(t);
+ connect(t.get(), SIGNAL(visibility_changed()),
+ this, SLOT(update()));
+ }
+}
+
void Viewport::on_signals_moved()
{
update();
void Viewport::on_signals_moved()
{
update();