]> sigrok.org Git - pulseview.git/blobdiff - pv/view/view.cpp
View: Update view on capture state change
[pulseview.git] / pv / view / view.cpp
index f8b0fc4537ef71b83d0be751fbd6ddee564bd198..11026883bab1a7842dba1483c1c58c8b0650cb72 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
+#endif
 
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
 
-#include <set>
-
-#include <boost/foreach.hpp>
-
 #include <QEvent>
 #include <QMouseEvent>
 #include <QScrollBar>
 
+#include "cursorheader.h"
 #include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
-using namespace boost;
-using namespace std;
+using pv::data::SignalData;
+using std::deque;
+using std::list;
+using std::max;
+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 {
@@ -52,9 +60,6 @@ namespace view {
 const double View::MaxScale = 1e9;
 const double View::MinScale = 1e-15;
 
-const int View::LabelMarginWidth = 70;
-const int View::RulerHeight = 30;
-
 const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 30;
@@ -70,8 +75,8 @@ View::View(SigSession &session, QWidget *parent) :
        _session(session),
        _viewport(new Viewport(*this)),
        _ruler(new Ruler(*this)),
+       _cursorheader(new CursorHeader(*this)),
        _header(new Header(*this)),
-       _data_length(0),
        _scale(1e-6),
        _offset(0),
        _v_offset(0),
@@ -87,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()),
@@ -95,25 +104,35 @@ View::View(SigSession &session, QWidget *parent) :
        connect(_cursors.second().get(), SIGNAL(time_changed()),
                this, SLOT(marker_time_changed()));
 
+       connect(_header, SIGNAL(geometry_updated()),
+               this, SLOT(on_geometry_updated()));
        connect(_header, SIGNAL(signals_moved()),
                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()));
 
-       setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
        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()
@@ -143,19 +162,31 @@ int View::v_offset() const
 
 void View::zoom(double steps)
 {
-       zoom(steps, (width() - LabelMarginWidth) / 2);
+       zoom(steps, _viewport->width() / 2);
 }
 
 void View::zoom(double steps, int offset)
 {
-       const double cursor_offset = _offset + _scale * offset;
-       const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
-               MaxScale), MinScale);
-       const double new_offset = cursor_offset - new_scale * offset;
-       set_scale_offset(new_scale, new_offset);
+       set_zoom(_scale * pow(3.0/2.0, -steps), offset);
 }
 
 void View::zoom_fit()
+{
+       const pair<double, double> extents = get_time_extents();
+       const double delta = extents.second - extents.first;
+       if (delta < 1e-12)
+               return;
+
+       assert(_viewport);
+       const int w = _viewport->width();
+       if (w <= 0)
+               return;
+
+       const double scale = max(min(delta / w, MaxScale), MinScale);
+       set_scale_offset(scale, extents.first);
+}
+
+void View::zoom_one_to_one()
 {
        using pv::data::SignalData;
 
@@ -163,25 +194,17 @@ void View::zoom_fit()
                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 left_time = DBL_MAX, right_time = DBL_MIN;
-       BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
-       {
-               const double start_time = d->get_start_time();
-               left_time = min(left_time, start_time);
-               right_time = max(right_time, start_time +
-                       d->get_max_sample_count() / d->samplerate());
+       double samplerate = 0.0;
+       for (const shared_ptr<SignalData> d : visible_data) {
+               assert(d);
+               samplerate = max(samplerate, d->samplerate());
        }
 
-       assert(left_time < right_time);
-       if (right_time - left_time < 1e-12)
+       if (samplerate == 0.0)
                return;
 
        assert(_viewport);
@@ -189,7 +212,7 @@ void View::zoom_fit()
        if (w <= 0)
                return;
 
-       set_scale_offset((right_time - left_time) / w, left_time);      
+       set_zoom(1.0 / samplerate, w / 2);
 }
 
 void View::set_scale_offset(double scale, double offset)
@@ -199,6 +222,7 @@ void View::set_scale_offset(double scale, double offset)
 
        update_scroll();
        _ruler->update();
+       _cursorheader->update();
        _viewport->update();
        scale_offset_changed();
 }
@@ -207,14 +231,20 @@ vector< shared_ptr<Trace> > View::get_traces() const
 {
        const vector< shared_ptr<Signal> > sigs(
                session().get_signals());
+#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());
+#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);
+#endif
 
        stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
        return traces;
@@ -226,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);
@@ -241,6 +271,42 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
        return items;
 }
 
+set< shared_ptr<SignalData> > View::get_visible_data() const
+{
+       const vector< shared_ptr<Signal> > sigs(
+               session().get_signals());
+
+       // Make a set of all the visible data objects
+       set< shared_ptr<SignalData> > visible_data;
+       for (const shared_ptr<Signal> sig : sigs)
+               if (sig->enabled())
+                       visible_data.insert(sig->data());
+
+       return visible_data;
+}
+
+pair<double, double> View::get_time_extents() const
+{
+       const set< shared_ptr<SignalData> > visible_data = get_visible_data();
+       if (visible_data.empty())
+               return make_pair(0.0, 0.0);
+
+       double left_time = DBL_MAX, right_time = DBL_MIN;
+       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() / samplerate);
+       }
+
+       assert(left_time < right_time);
+       return make_pair(left_time, right_time);
+}
+
 bool View::cursors_shown() const
 {
        return _show_cursors;
@@ -249,7 +315,7 @@ bool View::cursors_shown() const
 void View::show_cursors(bool show)
 {
        _show_cursors = show;
-       _ruler->update();
+       _cursorheader->update();
        _viewport->update();
 }
 
@@ -258,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();
 }
 
@@ -282,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);
@@ -301,14 +367,19 @@ void View::update_viewport()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
-       const shared_ptr<data::SignalData> sig_data = _session.get_data();
-       if (!sig_data)
-               return;
-
-       length = _data_length / (sig_data->samplerate() * _scale);
+       const pair<double, double> extents = get_time_extents();
+       length = (extents.second - extents.first) / _scale;
        offset = _offset / _scale;
 }
 
+void View::set_zoom(double scale, int offset)
+{
+       const double cursor_offset = _offset + _scale * offset;
+       const double new_scale = max(min(scale, MaxScale), MinScale);
+       const double new_offset = cursor_offset - new_scale * offset;
+       set_scale_offset(new_scale, new_offset);
+}
+
 void View::update_scroll()
 {
        assert(_viewport);
@@ -342,6 +413,22 @@ void View::update_scroll()
                areaSize.height());
 }
 
+void View::update_layout()
+{
+       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(),
+               _header->sizeHint().width(), _viewport->height());
+       update_scroll();
+}
+
 bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
        const shared_ptr<Trace> &b)
 {
@@ -358,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());
@@ -384,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:
@@ -393,11 +483,7 @@ bool View::viewportEvent(QEvent *e)
 
 void View::resizeEvent(QResizeEvent*)
 {
-       _ruler->setGeometry(_viewport->x(), 0,
-               _viewport->width(), _viewport->y());
-       _header->setGeometry(0, _viewport->y(),
-               _viewport->x(), _viewport->height());
-       update_scroll();
+       update_layout();
 }
 
 void View::h_scroll_value_changed(int value)
@@ -415,6 +501,7 @@ void View::h_scroll_value_changed(int value)
        }
 
        _ruler->update();
+       _cursorheader->update();
        _viewport->update();
 }
 
@@ -429,29 +516,18 @@ 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;
        }
 
+       update_layout();
        normalize_layout();
 }
 
 void View::data_updated()
 {
-       // Get the new data length
-       _data_length = 0;
-       shared_ptr<data::Logic> sig_data = _session.get_data();
-       if (sig_data) {
-               deque< shared_ptr<data::LogicSnapshot> > &snapshots =
-                       sig_data->get_snapshots();
-               BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
-                       if (s)
-                               _data_length = max(_data_length,
-                                       s->get_sample_count());
-       }
-
        // Update the scroll bars
        update_scroll();
 
@@ -461,7 +537,7 @@ void View::data_updated()
 
 void View::marker_time_changed()
 {
-       _ruler->update();
+       _cursorheader->update();
        _viewport->update();
 }
 
@@ -471,5 +547,10 @@ void View::on_signals_moved()
        signals_moved();
 }
 
+void View::on_geometry_updated()
+{
+       update_layout();
+}
+
 } // namespace view
 } // namespace pv