View: Update view on capture state change

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index a437918d9f2a88f3001f35ae9eb33b854530924c..11026883bab1a7842dba1483c1c58c8b0650cb72 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -26,12 +26,11 @@
 #include <limits.h>
 #include <math.h>
 
-#include <boost/foreach.hpp>
-
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
 
+#include "cursorheader.h"
 #include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
@@ -43,8 +42,6 @@
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
-using boost::shared_ptr;
-using boost::weak_ptr;
 using pv::data::SignalData;
 using std::deque;
 using std::list;
@@ -53,7 +50,9 @@ using std::make_pair;
 using std::min;
 using std::pair;
 using std::set;
+using std::shared_ptr;
 using std::vector;
+using std::weak_ptr;
 
 namespace pv {
 namespace view {
@@ -76,6 +75,7 @@ View::View(SigSession &session, QWidget *parent) :
        _session(session),
        _viewport(new Viewport(*this)),
        _ruler(new Ruler(*this)),
+       _cursorheader(new CursorHeader(*this)),
        _header(new Header(*this)),
        _scale(1e-6),
        _offset(0),
@@ -92,7 +92,11 @@ View::View(SigSession &session, QWidget *parent) :
 
        connect(&_session, SIGNAL(signals_changed()),
                this, SLOT(signals_changed()));
-       connect(&_session, SIGNAL(data_updated()),
+       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()),
                this, SLOT(data_updated()));
 
        connect(_cursors.first().get(), SIGNAL(time_changed()),
@@ -106,20 +110,29 @@ View::View(SigSession &session, QWidget *parent) :
                this, SLOT(on_signals_moved()));
 
        connect(_header, SIGNAL(selection_changed()),
-               _ruler, SLOT(clear_selection()));
-       connect(_ruler, SIGNAL(selection_changed()),
+               _cursorheader, SLOT(clear_selection()));
+       connect(_cursorheader, SIGNAL(selection_changed()),
                _header, SLOT(clear_selection()));
 
        connect(_header, SIGNAL(selection_changed()),
                this, SIGNAL(selection_changed()));
-       connect(_ruler, SIGNAL(selection_changed()),
+       connect(_cursorheader, SIGNAL(selection_changed()),
                this, SIGNAL(selection_changed()));
 
        setViewport(_viewport);
 
        _viewport->installEventFilter(this);
        _ruler->installEventFilter(this);
+       _cursorheader->installEventFilter(this);
        _header->installEventFilter(this);
+
+       // Trigger the initial event manually. The default device has signals
+       // which were created before this object came into being
+       signals_changed();
+
+       // make sure the transparent widgets are on the top
+       _cursorheader->raise();
+       _header->raise();
 }
 
 SigSession& View::session()
@@ -154,9 +167,7 @@ void View::zoom(double steps)
 
 void View::zoom(double steps, int offset)
 {
-       const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
-               MaxScale), MinScale);
-       set_zoom(new_scale, offset);
+       set_zoom(_scale * pow(3.0/2.0, -steps), offset);
 }
 
 void View::zoom_fit()
@@ -171,7 +182,8 @@ void View::zoom_fit()
        if (w <= 0)
                return;
 
-       set_scale_offset(delta / w, extents.first);
+       const double scale = max(min(delta / w, MaxScale), MinScale);
+       set_scale_offset(scale, extents.first);
 }
 
 void View::zoom_one_to_one()
@@ -182,16 +194,12 @@ void View::zoom_one_to_one()
                session().get_signals());
 
        // Make a set of all the visible data objects
-       set< shared_ptr<SignalData> > visible_data;
-       BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
-               if (sig->enabled())
-                       visible_data.insert(sig->data());
-
+       set< shared_ptr<SignalData> > visible_data = get_visible_data();
        if (visible_data.empty())
                return;
 
        double samplerate = 0.0;
-       BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data) {
+       for (const shared_ptr<SignalData> d : visible_data) {
                assert(d);
                samplerate = max(samplerate, d->samplerate());
        }
@@ -214,6 +222,7 @@ void View::set_scale_offset(double scale, double offset)
 
        update_scroll();
        _ruler->update();
+       _cursorheader->update();
        _viewport->update();
        scale_offset_changed();
 }
@@ -231,7 +240,7 @@ vector< shared_ptr<Trace> > View::get_traces() const
        vector< shared_ptr<Trace> > traces(sigs.size());
 #endif
 
-       vector< shared_ptr<Trace> >::iterator i = traces.begin();
+       auto i = traces.begin();
        i = copy(sigs.begin(), sigs.end(), i);
 #ifdef ENABLE_DECODE
        i = copy(decode_sigs.begin(), decode_sigs.end(), i);
@@ -247,7 +256,7 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
 
        // List the selected signals
        const vector< shared_ptr<Trace> > traces(get_traces());
-       BOOST_FOREACH (shared_ptr<Trace> t, traces) {
+       for (shared_ptr<Trace> t : traces) {
                assert(t);
                if (t->selected())
                        items.push_back(t);
@@ -269,7 +278,7 @@ set< shared_ptr<SignalData> > View::get_visible_data() const
 
        // Make a set of all the visible data objects
        set< shared_ptr<SignalData> > visible_data;
-       BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
+       for (const shared_ptr<Signal> sig : sigs)
                if (sig->enabled())
                        visible_data.insert(sig->data());
 
@@ -283,12 +292,15 @@ pair<double, double> View::get_time_extents() const
                return make_pair(0.0, 0.0);
 
        double left_time = DBL_MAX, right_time = DBL_MIN;
-       BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
+       for (const shared_ptr<SignalData> d : visible_data)
        {
                const double start_time = d->get_start_time();
+               double samplerate = d->samplerate();
+               samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
+
                left_time = min(left_time, start_time);
                right_time = max(right_time, start_time +
-                       d->get_max_sample_count() / d->samplerate());
+                       d->get_max_sample_count() / samplerate);
        }
 
        assert(left_time < right_time);
@@ -303,7 +315,7 @@ bool View::cursors_shown() const
 void View::show_cursors(bool show)
 {
        _show_cursors = show;
-       _ruler->update();
+       _cursorheader->update();
        _viewport->update();
 }
 
@@ -312,7 +324,7 @@ 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();
+       _cursorheader->update();
        _viewport->update();
 }
 
@@ -336,11 +348,11 @@ void View::normalize_layout()
        const vector< shared_ptr<Trace> > traces(get_traces());
 
        int v_min = INT_MAX;
-       BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+       for (const shared_ptr<Trace> t : traces)
                v_min = min(t->get_v_offset(), v_min);
 
        const int delta = -min(v_min, 0);
-       BOOST_FOREACH(shared_ptr<Trace> t, traces)
+       for (shared_ptr<Trace> t : traces)
                t->set_v_offset(t->get_v_offset() + delta);
 
        verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@ -403,12 +415,17 @@ void View::update_scroll()
 
 void View::update_layout()
 {
-       setViewportMargins(_header->sizeHint().width(),
+       setViewportMargins(
+               _header->sizeHint().width() - pv::view::Header::BaselineOffset,
                _ruler->sizeHint().height(), 0, 0);
        _ruler->setGeometry(_viewport->x(), 0,
                _viewport->width(), _viewport->y());
+       _cursorheader->setGeometry(
+               _viewport->x(),
+               _ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
+               _viewport->width(), _cursorheader->sizeHint().height());
        _header->setGeometry(0, _viewport->y(),
-               _viewport->x(), _viewport->height());
+               _header->sizeHint().width(), _viewport->height());
        update_scroll();
 }
 
@@ -428,7 +445,7 @@ bool View::eventFilter(QObject *object, QEvent *event)
                const QMouseEvent *const mouse_event = (QMouseEvent*)event;
                if (object == _viewport)
                        _hover_point = mouse_event->pos();
-               else if (object == _ruler)
+               else if (object == _ruler || object == _cursorheader)
                        _hover_point = QPoint(mouse_event->x(), 0);
                else if (object == _header)
                        _hover_point = QPoint(0, mouse_event->y());
@@ -454,6 +471,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:
@@ -481,6 +501,7 @@ void View::h_scroll_value_changed(int value)
        }
 
        _ruler->update();
+       _cursorheader->update();
        _viewport->update();
 }
 
@@ -495,7 +516,7 @@ void View::signals_changed()
 {
        int offset = SignalMargin + SignalHeight;
        const vector< shared_ptr<Trace> > traces(get_traces());
-       BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+       for (shared_ptr<Trace> t : traces) {
                t->set_view(this);
                t->set_v_offset(offset);
                offset += SignalHeight + 2 * SignalMargin;
@@ -516,7 +537,7 @@ void View::data_updated()
 
 void View::marker_time_changed()
 {
-       _ruler->update();
+       _cursorheader->update();
        _viewport->update();
 }