Bring the cursors into view when they are shown

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index e0fce889fe06431c6122c4eaad1ec2a9938b6d39..6ea8cc0af30eea06c6fbc9e7523bf1e8ca257c1c 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -34,9 +34,9 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
-#include "../sigsession.h"
+#include "pv/sigsession.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -70,9 +70,9 @@ View::View(SigSession &session, QWidget *parent) :
        _scale(1e-6),
        _offset(0),
        _v_offset(0),
+       _updating_scroll(false),
        _show_cursors(false),
-       _cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
-               Cursor(*this, 1.0))),
+       _cursors(*this),
        _hover_point(-1, -1)
 {
        connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -85,9 +85,9 @@ View::View(SigSession &session, QWidget *parent) :
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
-       connect(&_cursors.first, SIGNAL(time_changed()),
+       connect(&_cursors.first(), SIGNAL(time_changed()),
                this, SLOT(marker_time_changed()));
-       connect(&_cursors.second, SIGNAL(time_changed()),
+       connect(&_cursors.second(), SIGNAL(time_changed()),
                this, SLOT(marker_time_changed()));
 
        connect(_header, SIGNAL(signals_moved()),
@@ -161,7 +161,16 @@ void View::show_cursors(bool show)
        _viewport->update();
 }
 
-std::pair<Cursor, Cursor>& View::cursors()
+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();
+       _viewport->update();
+}
+
+CursorPair& View::cursors()
 {
        return _cursors;
 }
@@ -189,8 +198,8 @@ void View::normalize_layout()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
-       const shared_ptr<SignalData> sig_data = _session.get_data();
-       if(!sig_data)
+       const shared_ptr<data::SignalData> sig_data = _session.get_data();
+       if (!sig_data)
                return;
 
        length = _data_length / (sig_data->get_samplerate() * _scale);
@@ -208,9 +217,11 @@ void View::update_scroll()
        get_scroll_layout(length, offset);
        length = max(length - areaSize.width(), 0.0);
 
-       horizontalScrollBar()->setPageStep(areaSize.width());
+       horizontalScrollBar()->setPageStep(areaSize.width() / 2);
 
-       if(length < MaxScrollValue) {
+       _updating_scroll = true;
+
+       if (length < MaxScrollValue) {
                horizontalScrollBar()->setRange(0, length);
                horizontalScrollBar()->setSliderPosition(offset);
        } else {
@@ -219,6 +230,8 @@ void View::update_scroll()
                        _offset * MaxScrollValue / (_scale * length));
        }
 
+       _updating_scroll = false;
+
        // Set the vertical scrollbar
        verticalScrollBar()->setPageStep(areaSize.height());
        verticalScrollBar()->setRange(0,
@@ -228,7 +241,7 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-       int offset = SignalMargin;
+       int offset = SignalMargin + SignalHeight;
        const vector< shared_ptr<Signal> > sigs(_session.get_signals());
        BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
                s->set_v_offset(offset);
@@ -241,21 +254,21 @@ void View::reset_signal_layout()
 bool View::eventFilter(QObject *object, QEvent *event)
 {
        const QEvent::Type type = event->type();
-       if(type == QEvent::MouseMove) {
+       if (type == QEvent::MouseMove) {
 
                const QMouseEvent *const mouse_event = (QMouseEvent*)event;
-               if(object == _viewport)
+               if (object == _viewport)
                        _hover_point = mouse_event->pos();
-               else if(object == _ruler)
+               else if (object == _ruler)
                        _hover_point = QPoint(mouse_event->x(), 0);
-               else if(object == _header)
+               else if (object == _header)
                        _hover_point = QPoint(0, mouse_event->y());
                else
                        _hover_point = QPoint(-1, -1);
 
                hover_point_changed();
 
-       } else if(type == QEvent::Leave) {
+       } else if (type == QEvent::Leave) {
                _hover_point = QPoint(-1, -1);
                hover_point_changed();
        }
@@ -279,7 +292,7 @@ bool View::viewportEvent(QEvent *e)
        }
 }
 
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
 {
        _ruler->setGeometry(_viewport->x(), 0,
                _viewport->width(), _viewport->y());
@@ -290,8 +303,11 @@ void View::resizeEvent(QResizeEvent *e)
 
 void View::h_scroll_value_changed(int value)
 {
+       if (_updating_scroll)
+               return;
+
        const int range = horizontalScrollBar()->maximum();
-       if(range < MaxScrollValue)
+       if (range < MaxScrollValue)
                _offset = _scale * value;
        else {
                double length = 0, offset;
@@ -319,12 +335,12 @@ void View::data_updated()
 {
        // Get the new data length
        _data_length = 0;
-       shared_ptr<LogicData> sig_data = _session.get_data();
-       if(sig_data) {
-               deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+       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<LogicDataSnapshot> s, snapshots)
-                       if(s)
+               BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)
+                       if (s)
                                _data_length = max(_data_length,
                                        s->get_sample_count());
        }