projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::view::RowItemIterator
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index c987c3683164e598d9c1f94e8b0a88560ad33920..43da472890120e4eb01acfb59fdd14db0d716cc0 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-20,6
+20,7
@@
#include <cassert>
#include <cmath>
#include <cassert>
#include <cmath>
+#include <algorithm>
#include "view.h"
#include "viewport.h"
#include "view.h"
#include "viewport.h"
@@
-33,6
+34,7
@@
using std::abs;
using std::max;
using std::min;
using std::shared_ptr;
using std::max;
using std::min;
using std::shared_ptr;
+using std::stable_sort;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
@@
-75,7
+77,10
@@
int Viewport::get_total_height() const
void Viewport::paintEvent(QPaintEvent*)
{
void Viewport::paintEvent(QPaintEvent*)
{
- const vector< shared_ptr<RowItem> > row_items(_view.child_items());
+ vector< shared_ptr<RowItem> > row_items(_view.child_items());
+ 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(); });
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);