projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various minor whitespace and consistency fixes.
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 007a8c218878fa14cf0477322b7557296a990a14..5cb65079f1c98fe61242862404b15c908a6d3602 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-57,17
+57,18
@@
Viewport::Viewport(View &parent) :
shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
{
shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
{
+ const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
const vector< shared_ptr<ViewItem> > items(this->items());
for (auto i = items.rbegin(); i != items.rend(); i++)
if ((*i)->enabled() &&
const vector< shared_ptr<ViewItem> > items(this->items());
for (auto i = items.rbegin(); i != items.rend(); i++)
if ((*i)->enabled() &&
- (*i)->hit_box_rect(
rect()
).contains(pt))
+ (*i)->hit_box_rect(
pp
).contains(pt))
return *i;
return nullptr;
}
void Viewport::item_hover(const shared_ptr<ViewItem> &item)
{
return *i;
return nullptr;
}
void Viewport::item_hover(const shared_ptr<ViewItem> &item)
{
- if (item)
+ if (item
&& item->is_draggable()
)
setCursor(dynamic_pointer_cast<RowItem>(item) ?
Qt::SizeVerCursor : Qt::SizeHorCursor);
else
setCursor(dynamic_pointer_cast<RowItem>(item) ?
Qt::SizeVerCursor : Qt::SizeHorCursor);
else
@@
-95,7
+96,10
@@
void Viewport::drag_release()
vector< shared_ptr<ViewItem> > Viewport::items()
{
vector< shared_ptr<ViewItem> > Viewport::items()
{
- vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+ vector< shared_ptr<ViewItem> > items;
+ const std::vector< shared_ptr<ViewItem> > view_items(
+ view_.list_by_type<ViewItem>());
+ copy(view_items.begin(), view_items.end(), back_inserter(items));
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
copy(time_items.begin(), time_items.end(), back_inserter(items));
return items;
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
copy(time_items.begin(), time_items.end(), back_inserter(items));
return items;
@@
-148,13
+152,13
@@
bool Viewport::touch_event(QTouchEvent *event)
void Viewport::paintEvent(QPaintEvent*)
{
void Viewport::paintEvent(QPaintEvent*)
{
- vector< shared_ptr<
TraceTreeItem> > row_items(view_.begin(), view_.end
());
+ vector< shared_ptr<
RowItem> > row_items(view_.list_by_type<RowItem>
());
assert(none_of(row_items.begin(), row_items.end(),
assert(none_of(row_items.begin(), row_items.end(),
- [](const shared_ptr<
TraceTree
Item> &r) { return !r; }));
+ [](const shared_ptr<
Row
Item> &r) { return !r; }));
stable_sort(row_items.begin(), row_items.end(),
stable_sort(row_items.begin(), row_items.end(),
- [](const shared_ptr<
TraceTreeItem> &a, const shared_ptr<TraceTree
Item> &b) {
- return a->
visual_v_offset() < b->visual_v_offset
(); });
+ [](const shared_ptr<
RowItem> &a, const shared_ptr<Row
Item> &b) {
+ return a->
point(QRect()).y() < b->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(),
@@
-167,18
+171,18
@@
void Viewport::paintEvent(QPaintEvent*)
for (const shared_ptr<TimeItem> t : time_items)
t->paint_back(p, pp);
for (const shared_ptr<TimeItem> t : time_items)
t->paint_back(p, pp);
- for (const shared_ptr<
TraceTree
Item> r : row_items)
+ for (const shared_ptr<
Row
Item> r : row_items)
r->paint_back(p, pp);
for (const shared_ptr<TimeItem> t : time_items)
t->paint_mid(p, pp);
r->paint_back(p, pp);
for (const shared_ptr<TimeItem> t : time_items)
t->paint_mid(p, pp);
- for (const shared_ptr<
TraceTree
Item> r : row_items)
+ for (const shared_ptr<
Row
Item> r : row_items)
r->paint_mid(p, pp);
r->paint_mid(p, pp);
- p.setRenderHint(QPainter::Antialiasing, false);
-
- for (const shared_ptr<TraceTreeItem> r : row_items)
+ for (const shared_ptr<RowItem> r : row_items)
r->paint_fore(p, pp);
r->paint_fore(p, pp);
+
+ p.setRenderHint(QPainter::Antialiasing, false);
for (const shared_ptr<TimeItem> t : time_items)
t->paint_fore(p, pp);
for (const shared_ptr<TimeItem> t : time_items)
t->paint_fore(p, pp);
@@
-199,8
+203,7
@@
void Viewport::wheelEvent(QWheelEvent *e)
{
assert(e);
{
assert(e);
- if (e->orientation() == Qt::Vertical)
- {
+ if (e->orientation() == Qt::Vertical) {
if (e->modifiers() & Qt::ControlModifier) {
// Vertical scrolling with the control key pressed
// is intrepretted as vertical scrolling
if (e->modifiers() & Qt::ControlModifier) {
// Vertical scrolling with the control key pressed
// is intrepretted as vertical scrolling
@@
-210,9
+213,7
@@
void Viewport::wheelEvent(QWheelEvent *e)
// Vertical scrolling is interpreted as zooming in/out
view_.zoom(e->delta() / 120, e->x());
}
// Vertical scrolling is interpreted as zooming in/out
view_.zoom(e->delta() / 120, e->x());
}
- }
- else if (e->orientation() == Qt::Horizontal)
- {
+ } else if (e->orientation() == Qt::Horizontal) {
// Horizontal scrolling is interpreted as moving left/right
view_.set_scale_offset(view_.scale(),
e->delta() * view_.scale() + view_.offset());
// Horizontal scrolling is interpreted as moving left/right
view_.set_scale_offset(view_.scale(),
e->delta() * view_.scale() + view_.offset());