Use static signal offsets instead of offsets calculated on-the-fly

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7d3dc7f628a73b9bd5e4be03d6c8a6e45e33dfb2..e36072ef78ce0d76b88547a32616a5f9a110f9b0 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -30,6 +30,7 @@
 
 #include "header.h"
 #include "ruler.h"
+#include "signal.h"
 #include "view.h"
 #include "viewport.h"
 
@@ -55,6 +56,8 @@ const int View::SignalHeight = 50;
 
 const QColor View::CursorAreaColour(220, 231, 243);
 
+const QSizeF View::LabelPadding(4, 0);
+
 View::View(SigSession &session, QWidget *parent) :
        QAbstractScrollArea(parent),
        _session(session),
@@ -77,6 +80,11 @@ View::View(SigSession &session, QWidget *parent) :
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
+       connect(&_cursors.first, SIGNAL(time_changed()),
+               this, SLOT(marker_time_changed()));
+       connect(&_cursors.second, SIGNAL(time_changed()),
+               this, SLOT(marker_time_changed()));
+
        setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
        setViewport(_viewport);
 
@@ -193,6 +201,16 @@ void View::update_scroll()
                _viewport->get_total_height() - areaSize.height());
 }
 
+void View::reset_signal_layout()
+{
+       int offset = 0;
+       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+               s->set_v_offset(offset);
+               offset += SignalHeight;
+       }
+}
+
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
@@ -284,6 +302,15 @@ void View::data_updated()
 
        // Repaint the view
        _viewport->update();
+
+       /// @todo: Call this only once when the signals are first created.
+       reset_signal_layout();
+}
+
+void View::marker_time_changed()
+{
+       _ruler->update();
+       _viewport->update();
 }
 
 } // namespace view