projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved form generation into Binding
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 7f2cedea0ccde0a1975c5a202e82a46fd62400b2..8cf97ff58020594b2e6c82290589a70112b260e0 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-49,11
+49,10
@@
Viewport::Viewport(View &parent) :
int Viewport::get_total_height() const
{
int h = 0;
int Viewport::get_total_height() const
{
int h = 0;
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
- assert(s);
- h = max(s->get_v_offset() + View::SignalHeight, h);
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+ assert(t);
+ h = max(t->get_v_offset() + View::SignalHeight, h);
}
return h;
}
return h;
@@
-61,8
+60,7
@@
int Viewport::get_total_height() const
void Viewport::paintEvent(QPaintEvent*)
{
void Viewport::paintEvent(QPaintEvent*)
{
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
@@
-71,14
+69,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<Signal> s, sigs)
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
{
- assert(s);
- s->paint(p, s->get_v_offset() - v_offset, 0, width(),
- _view.scale(), _view.offset());
+ assert(t);
+ 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());