Revert "View: Decouple horizontal scrolling from the scoll bar"

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7a444f7c47f68b1032e6a0b359366afb4272e50f..34676334dc67867ba9b17fa064498232693e74e0 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;
@@ -173,7 +173,7 @@ const QPoint& View::hover_point() const
 
 void View::normalize_layout()
 {
-       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       const vector< shared_ptr<Signal> > sigs(_session.get_signals());
 
        int v_min = INT_MAX;
        BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
@@ -189,8 +189,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);
@@ -210,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 {
@@ -228,8 +228,8 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
-       int offset = SignalMargin;
-       vector< shared_ptr<Signal> > &sigs = _session.get_signals();
+       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);
                offset += SignalHeight + 2 * SignalMargin;
@@ -241,21 +241,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 +279,7 @@ bool View::viewportEvent(QEvent *e)
        }
 }
 
-void View::resizeEvent(QResizeEvent *e)
+void View::resizeEvent(QResizeEvent*)
 {
        _ruler->setGeometry(_viewport->x(), 0,
                _viewport->width(), _viewport->y());
@@ -291,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;
@@ -319,12 +319,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());
        }