Some smaller whitespace fixes.

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 9c4920f997f66585d8f75e2e62da15f2f587d531..8fca4be28b9af9cc059d6e4df04ad47ad853f17f 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"
 
@@ -50,7 +52,13 @@ const int View::RulerHeight = 30;
 
 const int View::MaxScrollValue = INT_MAX / 2;
 
-const int View::SignalHeight = 50;
+const int View::SignalHeight = 30;
+const int View::SignalMargin = 10;
+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,17 +69,36 @@ 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)));
        connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(v_scroll_value_changed(int)));
+
+       connect(&_session, SIGNAL(signals_changed()),
+               this, SLOT(signals_changed()));
        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,10 +149,48 @@ 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::normalize_layout()
+{
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+
+       int v_min = INT_MAX;
+       BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+               v_min = min(s->get_v_offset(), v_min);
+
+       const int delta = -min(v_min, 0);
+       BOOST_FOREACH(shared_ptr<Signal> s, sigs)
+               s->set_v_offset(s->get_v_offset() + delta);
+
+       verticalScrollBar()->setSliderPosition(_v_offset + delta);
+       v_scroll_value_changed(verticalScrollBar()->sliderPosition());
+}
+
 void View::get_scroll_layout(double &length, double &offset) const
 {
        const shared_ptr<SignalData> sig_data = _session.get_data();
-       if(!sig_data)
+       if (!sig_data)
                return;
 
        length = _data_length / (sig_data->get_samplerate() * _scale);
@@ -145,7 +210,7 @@ void View::update_scroll()
 
        horizontalScrollBar()->setPageStep(areaSize.width());
 
-       if(length < MaxScrollValue) {
+       if (length < MaxScrollValue) {
                horizontalScrollBar()->setRange(0, length);
                horizontalScrollBar()->setSliderPosition(offset);
        } else {
@@ -157,7 +222,45 @@ void View::update_scroll()
        // Set the vertical scrollbar
        verticalScrollBar()->setPageStep(areaSize.height());
        verticalScrollBar()->setRange(0,
-               _viewport->get_total_height() - areaSize.height());
+               _viewport->get_total_height() + SignalMargin -
+               areaSize.height());
+}
+
+void View::reset_signal_layout()
+{
+       int offset = SignalMargin;
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
+       BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+               s->set_v_offset(offset);
+               offset += SignalHeight + 2 * SignalMargin;
+       }
+
+       normalize_layout();
+}
+
+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)
@@ -188,7 +291,7 @@ void View::resizeEvent(QResizeEvent *e)
 void View::h_scroll_value_changed(int value)
 {
        const int range = horizontalScrollBar()->maximum();
-       if(range < MaxScrollValue)
+       if (range < MaxScrollValue)
                _offset = _scale * value;
        else {
                double length = 0, offset;
@@ -207,16 +310,21 @@ void View::v_scroll_value_changed(int value)
        _viewport->update();
 }
 
+void View::signals_changed()
+{
+       reset_signal_layout();
+}
+
 void View::data_updated()
 {
        // Get the new data length
        _data_length = 0;
        shared_ptr<LogicData> sig_data = _session.get_data();
-       if(sig_data) {
+       if (sig_data) {
                deque< shared_ptr<LogicDataSnapshot> > &snapshots =
                        sig_data->get_snapshots();
                BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
-                       if(s)
+                       if (s)
                                _data_length = max(_data_length,
                                        s->get_sample_count());
        }
@@ -228,5 +336,17 @@ void View::data_updated()
        _viewport->update();
 }
 
+void View::marker_time_changed()
+{
+       _ruler->update();
+       _viewport->update();
+}
+
+void View::on_signals_moved()
+{
+       update_scroll();
+       signals_moved();
+}
+
 } // namespace view
 } // namespace pv