Moved Signal and LogicSignal into pv::view

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 99e08b277d151160bbf3b0842d68f0119c60582a..d9b0ff1b85af41c44aa32a4212974470e437dfe5 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
+#include "signal.h"
 #include "../sigsession.h"
-#include "../signal.h"
 
 #include <QMouseEvent>
 
@@ -63,6 +63,8 @@ void Viewport::paintEvent(QPaintEvent *event)
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
+       draw_cursors_background(p);
+
        // Plot the signal
        int offset = -_view.v_offset();
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@ -77,6 +79,8 @@ void Viewport::paintEvent(QPaintEvent *event)
                offset += View::SignalHeight;
        }
 
+       draw_cursors_foreground(p);
+
        p.end();
 }
 
@@ -112,5 +116,33 @@ void Viewport::wheelEvent(QWheelEvent *event)
        _view.zoom(event->delta() / 120, event->x());
 }
 
+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);
+}
+
 } // namespace view
 } // namespace pv