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 8fca4be28b9af9cc059d6e4df04ad47ad853f17f..34676334dc67867ba9b17fa064498232693e74e0 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -34,9 +34,9 @@
 #include "view.h"
 #include "viewport.h"
 
 #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;
 
 using namespace boost;
 using namespace std;


@@ -189,7 +189,7 @@ void View::normalize_layout()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
 
 void View::get_scroll_layout(double &length, double &offset) const
 {

-       const shared_ptr<SignalData> sig_data = _session.get_data();
+       const shared_ptr<data::SignalData> sig_data = _session.get_data();

        if (!sig_data)
                return;
 
        if (!sig_data)
                return;
 


@@ -228,7 +228,7 @@ void View::update_scroll()
 
 void View::reset_signal_layout()
 {
 
 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);
        const vector< shared_ptr<Signal> > sigs(_session.get_signals());
        BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
                s->set_v_offset(offset);


@@ -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());
 {
        _ruler->setGeometry(_viewport->x(), 0,
                _viewport->width(), _viewport->y());


@@ -319,11 +319,11 @@ void View::data_updated()
 {
        // Get the new data length
        _data_length = 0;
 {
        // Get the new data length
        _data_length = 0;

-       shared_ptr<LogicData> sig_data = _session.get_data();
+       shared_ptr<data::Logic> sig_data = _session.get_data();

        if (sig_data) {
        if (sig_data) {

-               deque< shared_ptr<LogicDataSnapshot> > &snapshots =
+               deque< shared_ptr<data::LogicSnapshot> > &snapshots =

                        sig_data->get_snapshots();
                        sig_data->get_snapshots();

-               BOOST_FOREACH(shared_ptr<LogicDataSnapshot> s, snapshots)
+               BOOST_FOREACH(shared_ptr<data::LogicSnapshot> s, snapshots)

                        if (s)
                                _data_length = max(_data_length,
                                        s->get_sample_count());
                        if (s)
                                _data_length = max(_data_length,
                                        s->get_sample_count());