View: Simplified get_traces

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 1d55e14f7c91f20f55d09bffc1d4540d8819ddb6..388c4c49ec75e00f35fac366366bef960823a87c 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -43,6 +43,7 @@
 #include "pv/data/logicsnapshot.h"
 
 using pv::data::SignalData;
+using std::back_inserter;
 using std::deque;
 using std::list;
 using std::max;
@@ -92,6 +93,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 +120,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 +149,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;
@@ -227,24 +243,22 @@ void View::set_scale_offset(double scale, double offset)
 
 vector< shared_ptr<Trace> > View::get_traces() const
 {
+       vector< shared_ptr<Trace> > traces;
+
        const vector< shared_ptr<Signal> > sigs(
                session().get_signals());
+       copy(sigs.begin(), sigs.end(), back_inserter(traces));
+
 #ifdef ENABLE_DECODE
        const vector< shared_ptr<DecodeTrace> > decode_sigs(
                session().get_decode_signals());
-       vector< shared_ptr<Trace> > traces(
-               sigs.size() + decode_sigs.size());
-#else
-       vector< shared_ptr<Trace> > traces(sigs.size());
+       copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces));
 #endif
 
-       auto i = traces.begin();
-       i = copy(sigs.begin(), sigs.end(), i);
-#ifdef ENABLE_DECODE
-       i = copy(decode_sigs.begin(), decode_sigs.end(), i);
-#endif
+       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(); });
 
-       stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
        return traces;
 }
 
@@ -427,14 +441,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 +556,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