Improved propagation of drag event so that the scroll bars can be updated

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9c4920f997f66585d8f75e2e62da15f2f587d531..e3210fa39f3b9ac9d7bffc20797dd689bf27ce1d 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -25,10 +25,12 @@
 #include <boost/foreach.hpp>
 
 #include <QEvent>
+#include <QMouseEvent>
 #include <QScrollBar>
 
 #include "header.h"
 #include "ruler.h"
+#include "signal.h"
 #include "view.h"
 #include "viewport.h"
 
@@ -51,6 +53,11 @@ const int View::RulerHeight = 30;
 const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 50;
+const int View::SignalSnapGridSize = 10;
+
+const QColor View::CursorAreaColour(220, 231, 243);
+
+const QSizeF View::LabelPadding(4, 0);
 
 View::View(SigSession &session, QWidget *parent) :
        QAbstractScrollArea(parent),
@@ -61,7 +68,11 @@ View::View(SigSession &session, QWidget *parent) :
        _data_length(0),
        _scale(1e-6),
        _offset(0),
-       _v_offset(0)
+       _v_offset(0),
+       _show_cursors(false),
+       _cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
+               Cursor(*this, 1.0))),
+       _hover_point(-1, -1)
 {
        connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(h_scroll_value_changed(int)));
@@ -70,8 +81,20 @@ View::View(SigSession &session, QWidget *parent) :
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
+       connect(&_cursors.first, SIGNAL(time_changed()),
+               this, SLOT(marker_time_changed()));
+       connect(&_cursors.second, SIGNAL(time_changed()),
+               this, SLOT(marker_time_changed()));
+
+       connect(_header, SIGNAL(signals_moved()),
+               this, SLOT(on_signals_moved()));
+
        setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
        setViewport(_viewport);
+
+       _viewport->installEventFilter(this);
+       _ruler->installEventFilter(this);
+       _header->installEventFilter(this);
 }
 
 SigSession& View::session()
@@ -122,6 +145,28 @@ void View::set_scale_offset(double scale, double offset)
        _viewport->update();
 }
 
+bool View::cursors_shown() const
+{
+       return _show_cursors;
+}
+
+void View::show_cursors(bool show)
+{
+       _show_cursors = show;
+       _ruler->update();
+       _viewport->update();
+}
+
+std::pair<Cursor, Cursor>& View::cursors()
+{
+       return _cursors;
+}
+
+const QPoint& View::hover_point() const
+{
+       return _hover_point;
+}
+
 void View::get_scroll_layout(double &length, double &offset) const
 {
        const shared_ptr<SignalData> sig_data = _session.get_data();
@@ -160,6 +205,41 @@ void View::update_scroll()
                _viewport->get_total_height() - areaSize.height());
 }
 
+void View::reset_signal_layout()
+{
+       int offset = 0;
+       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+               s->set_v_offset(offset);
+               offset += SignalHeight;
+       }
+}
+
+bool View::eventFilter(QObject *object, QEvent *event)
+{
+       const QEvent::Type type = event->type();
+       if(type == QEvent::MouseMove) {
+
+               const QMouseEvent *const mouse_event = (QMouseEvent*)event;
+               if(object == _viewport)
+                       _hover_point = mouse_event->pos();
+               else if(object == _ruler)
+                       _hover_point = QPoint(mouse_event->x(), 0);
+               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) {
+               _hover_point = QPoint(-1, -1);
+               hover_point_changed();
+       }
+
+       return QObject::eventFilter(object, event);
+}
+
 bool View::viewportEvent(QEvent *e)
 {
        switch(e->type()) {
@@ -226,6 +306,21 @@ void View::data_updated()
 
        // Repaint the view
        _viewport->update();
+
+       /// @todo: Call this only once when the signals are first created.
+       reset_signal_layout();
+}
+
+void View::marker_time_changed()
+{
+       _ruler->update();
+       _viewport->update();
+}
+
+void View::on_signals_moved()
+{
+       update_scroll();
+       signals_moved();
 }
 
 } // namespace view