Paint decoder traces

[pulseview.git] / pv / view / viewport.cpp

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 70282d41c4acfbd1cbe759411a716de241079aee..0e0ae8ae4ad0807f5b99abe1f31ca458f437af94 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -49,11 +49,10 @@ Viewport::Viewport(View &parent) :
 int Viewport::get_total_height() const
 {
        int h = 0;
-       const vector< shared_ptr<Signal> > sigs(
-               _view.session().get_signals());
-       BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
-               assert(s);
-               h = max(s->get_v_offset() + View::SignalHeight, h);
+       const vector< shared_ptr<Trace> > traces(_view.get_traces());
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+               assert(t);
+               h = max(t->get_v_offset() + View::SignalHeight, h);
        }
 
        return h;
@@ -61,24 +60,25 @@ int Viewport::get_total_height() const
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-       const vector< shared_ptr<Signal> > sigs(
-               _view.session().get_signals());
+       const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
        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)
+       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
        {
-               assert(s);
-               s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+               assert(t);
+               t->paint(p, t->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();
 }
@@ -119,34 +119,6 @@ void Viewport::wheelEvent(QWheelEvent *event)
        }
 }
 
-void Viewport::draw_cursors_background(QPainter &p)
-{
-       if (!_view.cursors_shown())
-               return;
-
-       p.setPen(Qt::NoPen);
-       p.setBrush(QBrush(View::CursorAreaColour));
-
-       const CursorPair &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();
-       CursorPair &cursors = _view.cursors();
-       cursors.first().paint(p, r);
-       cursors.second().paint(p, r);
-}
-
 void Viewport::on_signals_moved()
 {
        update();