Initialise Trace widgets when the trace is received by the View

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 95b8a5bec9e9f1fde845898ee5ed7a0cf1bfcc58..3619ba0694d8f4bc48c5c8a97368e9f005192a9e 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -72,8 +72,7 @@ View::View(SigSession &session, QWidget *parent) :
        _v_offset(0),
        _updating_scroll(false),
        _show_cursors(false),
-       _cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
-               Cursor(*this, 1.0))),
+       _cursors(*this),
        _hover_point(-1, -1)
 {
        connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -86,14 +85,24 @@ View::View(SigSession &session, QWidget *parent) :
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
-       connect(&_cursors.first, SIGNAL(time_changed()),
+       connect(_cursors.first().get(), SIGNAL(time_changed()),
                this, SLOT(marker_time_changed()));
-       connect(&_cursors.second, SIGNAL(time_changed()),
+       connect(_cursors.second().get(), SIGNAL(time_changed()),
                this, SLOT(marker_time_changed()));
 
        connect(_header, SIGNAL(signals_moved()),
                this, SLOT(on_signals_moved()));
 
+       connect(_header, SIGNAL(selection_changed()),
+               _ruler, SLOT(clear_selection()));
+       connect(_ruler, SIGNAL(selection_changed()),
+               _header, SLOT(clear_selection()));
+
+       connect(_header, SIGNAL(selection_changed()),
+               this, SIGNAL(selection_changed()));
+       connect(_ruler, SIGNAL(selection_changed()),
+               this, SIGNAL(selection_changed()));
+
        setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
        setViewport(_viewport);
 
@@ -150,6 +159,27 @@ void View::set_scale_offset(double scale, double offset)
        _viewport->update();
 }
 
+list<weak_ptr<SelectableItem> > View::selected_items() const
+{
+       list<weak_ptr<SelectableItem> > items;
+
+       // List the selected signals
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+       BOOST_FOREACH (shared_ptr<Signal> s, sigs) {
+               assert(s);
+               if (s->selected())
+                       items.push_back(s);
+       }
+
+       // List the selected cursors
+       if (_cursors.first()->selected())
+               items.push_back(_cursors.first());
+       if (_cursors.second()->selected())
+               items.push_back(_cursors.second());
+
+       return items;
+}
+
 bool View::cursors_shown() const
 {
        return _show_cursors;
@@ -162,7 +192,21 @@ void View::show_cursors(bool show)
        _viewport->update();
 }
 
-std::pair<Cursor, Cursor>& View::cursors()
+void View::centre_cursors()
+{
+       const double time_width = _scale * _viewport->width();
+       _cursors.first()->set_time(_offset + time_width * 0.4);
+       _cursors.second()->set_time(_offset + time_width * 0.6);
+       _ruler->update();
+       _viewport->update();
+}
+
+CursorPair& View::cursors()
+{
+       return _cursors;
+}
+
+const CursorPair& View::cursors() const
 {
        return _cursors;
 }
@@ -231,18 +275,6 @@ void View::update_scroll()
                areaSize.height());
 }
 
-void View::reset_signal_layout()
-{
-       int offset = SignalMargin + SignalHeight;
-       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;
-       }
-
-       normalize_layout();
-}
-
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
@@ -320,7 +352,15 @@ void View::v_scroll_value_changed(int value)
 
 void View::signals_changed()
 {
-       reset_signal_layout();
+       int offset = SignalMargin + SignalHeight;
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+       BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+               s->init_context_bar_actions(NULL);
+               s->set_v_offset(offset);
+               offset += SignalHeight + 2 * SignalMargin;
+       }
+
+       normalize_layout();
 }
 
 void View::data_updated()