projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed an uneeded include
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 2b03b76723147852cede33b727fa6e549785d21d..ba26c3c1bcaf1743b0809c9d53c4b9fe44d6fbae 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-59,7
+59,7
@@
int Viewport::get_total_height() const
return h;
}
return h;
}
-void Viewport::paintEvent(QPaintEvent
*event
)
+void Viewport::paintEvent(QPaintEvent
*
)
{
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
{
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
@@
-74,11
+74,8
@@
void Viewport::paintEvent(QPaintEvent *event)
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
-
- const QRect signal_rect(0, s->get_v_offset() - v_offset,
- width(), View::SignalHeight);
-
- s->paint(p, signal_rect, _view.scale(), _view.offset());
+ s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+ _view.scale(), _view.offset());
}
draw_cursors_foreground(p);
}
draw_cursors_foreground(p);
@@
-107,11
+104,6
@@
void Viewport::mouseMoveEvent(QMouseEvent *event)
}
}
}
}
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
- assert(event);
-}
-
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
@@
-119,6
+111,11
@@
void Viewport::wheelEvent(QWheelEvent *event)
if (event->orientation() == Qt::Vertical) {
// Vertical scrolling is interpreted as zooming in/out
_view.zoom(event->delta() / 120, event->x());
if (event->orientation() == Qt::Vertical) {
// Vertical scrolling is interpreted as zooming in/out
_view.zoom(event->delta() / 120, event->x());
+ } else if (event->orientation() == Qt::Horizontal) {
+ // Horizontal scrolling is interpreted as moving left/right
+ _view.set_scale_offset(_view.scale(),
+ event->delta() * _view.scale()
+ + _view.offset());
}
}
}
}