projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add segment display mode UI controls and some related changes
[pulseview.git]
/
pv
/
views
/
trace
/
viewport.cpp
diff --git
a/pv/views/trace/viewport.cpp
b/pv/views/trace/viewport.cpp
index d426a133717596a8c8d396b9f6e4f08e146cef13..e9a9df0c89b4fb4e934a24f33f0ac0f6c15df7eb 100644
(file)
--- a/
pv/views/trace/viewport.cpp
+++ b/
pv/views/trace/viewport.cpp
@@
-37,7
+37,7
@@
using std::abs;
using std::back_inserter;
using std::copy;
using std::dynamic_pointer_cast;
using std::back_inserter;
using std::copy;
using std::dynamic_pointer_cast;
-using std::none_of; // Used in assert()s.
+using std::none_of; //
NOLINT.
Used in assert()s.
using std::shared_ptr;
using std::stable_sort;
using std::vector;
using std::shared_ptr;
using std::stable_sort;
using std::vector;
@@
-165,7
+165,7
@@
void Viewport::paintEvent(QPaintEvent*)
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->
point(QRect()).y() < b->
point(QRect()).y(); });
+ return a->
drag_point(QRect()).y() < b->drag_
point(QRect()).y(); });
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
assert(none_of(time_items.begin(), time_items.end(),
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
assert(none_of(time_items.begin(), time_items.end(),