Mutex protected SigSession::_signals

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c5465ff3c6ba19eef1cd68ba2082ba40d7f413c4..e0fce889fe06431c6122c4eaad1ec2a9938b6d39 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -79,6 +79,9 @@ View::View(SigSession &session, QWidget *parent) :
                this, SLOT(h_scroll_value_changed(int)));
        connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(v_scroll_value_changed(int)));
+
+       connect(&_session, SIGNAL(signals_changed()),
+               this, SLOT(signals_changed()));
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
@@ -170,7 +173,7 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
 
        int v_min = INT_MAX;
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@ -226,7 +229,7 @@ void View::update_scroll()
 void View::reset_signal_layout()
 {
        int offset = SignalMargin;
-       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
        BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
                s->set_v_offset(offset);
                offset += SignalHeight + 2 * SignalMargin;
@@ -307,6 +310,11 @@ void View::v_scroll_value_changed(int value)
        _viewport->update();
 }
 
+void View::signals_changed()
+{
+       reset_signal_layout();
+}
+
 void View::data_updated()
 {
        // Get the new data length
@@ -326,9 +334,6 @@ 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()