projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItemPaintParams: Renamed to ViewItemPaintParams
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index a94ada93faac055aae26761941e515b3318288a7..556babcc94435de43d98cd833914f751430d9a97 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-24,6
+24,7
@@
#include "signal.hpp"
#include "view.hpp"
#include "signal.hpp"
#include "view.hpp"
+#include "viewitempaintparams.hpp"
#include "viewport.hpp"
#include <pv/session.hpp>
#include "viewport.hpp"
#include <pv/session.hpp>
@@
-67,23
+68,25
@@
void Viewport::paintEvent(QPaintEvent*)
p.setRenderHint(QPainter::Antialiasing);
if (view_.cursors_shown())
p.setRenderHint(QPainter::Antialiasing);
if (view_.cursors_shown())
- view_.cursors().draw_viewport_background(p, rect());
+ view_.cursors()->draw_viewport_background(p, rect());
+
+ const ViewItemPaintParams pp(0, width(), view_.scale(), view_.offset());
// Plot the signal
for (const shared_ptr<RowItem> r : row_items)
{
assert(r);
// Plot the signal
for (const shared_ptr<RowItem> r : row_items)
{
assert(r);
- r->paint_back(p,
0, width()
);
+ r->paint_back(p,
pp
);
}
for (const shared_ptr<RowItem> r : row_items)
}
for (const shared_ptr<RowItem> r : row_items)
- r->paint_mid(p,
0, width()
);
+ r->paint_mid(p,
pp
);
for (const shared_ptr<RowItem> r : row_items)
for (const shared_ptr<RowItem> r : row_items)
- r->paint_fore(p,
0, width()
);
+ r->paint_fore(p,
pp
);
if (view_.cursors_shown())
if (view_.cursors_shown())
- view_.cursors()
.
draw_viewport_foreground(p, rect());
+ view_.cursors()
->
draw_viewport_foreground(p, rect());
p.end();
}
p.end();
}