View: Replace compare_trace_v_offsets with a lambda

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 1d55e14f7c91f20f55d09bffc1d4540d8819ddb6..305031ebd466c9a0b699e4641fa8b6639b8c5e5c 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -92,6 +92,8 @@ View::View(SigSession &session, QWidget *parent) :
 
        connect(&_session, SIGNAL(signals_changed()),
                this, SLOT(signals_changed()));
+       connect(&_session, SIGNAL(capture_state_changed(int)),
+               this, SLOT(data_updated()));
        connect(&_session, SIGNAL(data_received()),
                this, SLOT(data_updated()));
        connect(&_session, SIGNAL(frame_ended()),
@@ -117,6 +119,9 @@ View::View(SigSession &session, QWidget *parent) :
        connect(_cursorheader, SIGNAL(selection_changed()),
                this, SIGNAL(selection_changed()));
 
+       connect(this, SIGNAL(hover_point_changed()),
+               this, SLOT(on_hover_point_changed()));
+
        setViewport(_viewport);
 
        _viewport->installEventFilter(this);
@@ -143,6 +148,16 @@ const SigSession& View::session() const
        return _session;
 }
 
+Viewport* View::viewport()
+{
+       return _viewport;
+}
+
+const Viewport* View::viewport() const
+{
+       return _viewport;
+}
+
 double View::scale() const
 {
        return _scale;
@@ -244,7 +259,10 @@ vector< shared_ptr<Trace> > View::get_traces() const
        i = copy(decode_sigs.begin(), decode_sigs.end(), i);
 #endif
 
-       stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
+       stable_sort(traces.begin(), traces.end(),
+               [](const shared_ptr<Trace> &a, const shared_ptr<Trace> &b) {
+                       return a->get_v_offset() < b->get_v_offset(); });
+
        return traces;
 }
 
@@ -427,14 +445,6 @@ void View::update_layout()
        update_scroll();
 }
 
-bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
-       const shared_ptr<Trace> &b)
-{
-       assert(a);
-       assert(b);
-       return a->get_v_offset() < b->get_v_offset();
-}
-
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
@@ -550,5 +560,12 @@ void View::on_geometry_updated()
        update_layout();
 }
 
+void View::on_hover_point_changed()
+{
+       const vector< shared_ptr<Trace> > traces(get_traces());
+       for (shared_ptr<Trace> t : traces)
+               t->hover_point_changed();
+}
+
 } // namespace view
 } // namespace pv