RowItem: Renamed get_v_offset to v_offset

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 392114c848aa2c01a3e598cc0372ae2d5681e504..2cb3f3ed9b6f3dd1f2591b94911b150004f4ba94 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;
@@ -155,7 +171,7 @@ double View::offset() const
 
 int View::v_offset() const
 {
-       return _v_offset;
+       return -_v_offset;
 }
 
 void View::zoom(double steps)
@@ -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->v_offset() < b->v_offset(); });
 
-       stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
        return traces;
 }
 
@@ -347,11 +361,11 @@ void View::normalize_layout()
 
        int v_min = INT_MAX;
        for (const shared_ptr<Trace> t : traces)
-               v_min = min(t->get_v_offset(), v_min);
+               v_min = min(t->v_offset(), v_min);
 
        const int delta = -min(v_min, 0);
        for (shared_ptr<Trace> t : traces)
-               t->set_v_offset(t->get_v_offset() + delta);
+               t->set_v_offset(t->v_offset() + delta);
 
        verticalScrollBar()->setSliderPosition(_v_offset + delta);
        v_scroll_value_changed(verticalScrollBar()->sliderPosition());
@@ -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();
@@ -469,6 +475,9 @@ bool View::viewportEvent(QEvent *e)
        case QEvent::MouseButtonDblClick:
        case QEvent::MouseMove:
        case QEvent::Wheel:
+       case QEvent::TouchBegin:
+       case QEvent::TouchUpdate:
+       case QEvent::TouchEnd:
                return false;
 
        default:
@@ -547,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