return h;
}
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
{
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
- draw_cursors_background(p);
+ if (_view.cursors_shown())
+ _view.cursors().draw_viewport_background(p, rect());
// Plot the signal
const int v_offset = _view.v_offset();
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);
+ if (_view.cursors_shown())
+ _view.cursors().draw_viewport_foreground(p, rect());
p.end();
}
}
}
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
- assert(event);
-}
-
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
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());
}
}
-void Viewport::draw_cursors_background(QPainter &p)
-{
- if (!_view.cursors_shown())
- return;
-
- p.setPen(Qt::NoPen);
- p.setBrush(QBrush(View::CursorAreaColour));
-
- const pair<Cursor, Cursor> &c = _view.cursors();
- const float x1 = (c.first.time() - _view.offset()) / _view.scale();
- const float x2 = (c.second.time() - _view.offset()) / _view.scale();
- const int l = (int)max(min(x1, x2), 0.0f);
- const int r = (int)min(max(x1, x2), (float)width());
-
- p.drawRect(l, 0, r - l, height());
-}
-
-void Viewport::draw_cursors_foreground(QPainter &p)
-{
- if (!_view.cursors_shown())
- return;
-
- const QRect r = rect();
- pair<Cursor, Cursor> &cursors = _view.cursors();
- cursors.first.paint(p, r);
- cursors.second.paint(p, r);
-}
-
void Viewport::on_signals_moved()
{
update();