Refactoring in View and SigSession

Removed SigSession::get_data
Removed duplicated view-extents code

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 719f9ded3610b948438c65a2ebda098d76555f53..a582122c15d3cdb353551c209c2c388835d397de 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
 /*
  * This file is part of the PulseView project.
  *

- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -208,11 +208,6 @@ vector< shared_ptr<view::Signal> > SigSession::get_signals() const
        return _signals;
 }
 
        return _signals;
 }
 

-boost::shared_ptr<data::Logic> SigSession::get_data()
-{
-       return _logic_data;
-}
-

 #ifdef ENABLE_DECODE
 bool SigSession::add_decoder(srd_decoder *const dec)
 {
 #ifdef ENABLE_DECODE
 bool SigSession::add_decoder(srd_decoder *const dec)
 {

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 8b97f8c0364eedd1fcf60a9bd2782e800d46314f..748b81ffae3f193ba17363c6c640dc22e2ed3d50 100644 (file)
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
 /*
  * This file is part of the PulseView project.
  *

- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -92,8 +92,6 @@ public:
        std::vector< boost::shared_ptr<view::Signal> >
                get_signals() const;
 
        std::vector< boost::shared_ptr<view::Signal> >
                get_signals() const;
 

-       boost::shared_ptr<data::Logic> get_data();
-

 #ifdef ENABLE_DECODE
        bool add_decoder(srd_decoder *const dec);
 
 #ifdef ENABLE_DECODE
        bool add_decoder(srd_decoder *const dec);
 

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 438f72ddae02e018ab7f55c42f6c1645f0a94160..a437918d9f2a88f3001f35ae9eb33b854530924c 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -26,8 +26,6 @@
 #include <limits.h>
 #include <math.h>
 
 #include <limits.h>
 #include <math.h>
 

-#include <set>
-

 #include <boost/foreach.hpp>
 
 #include <QEvent>
 #include <boost/foreach.hpp>
 
 #include <QEvent>


@@ -47,10 +45,13 @@
 
 using boost::shared_ptr;
 using boost::weak_ptr;
 
 using boost::shared_ptr;
 using boost::weak_ptr;

+using pv::data::SignalData;

 using std::deque;
 using std::list;
 using std::max;
 using std::deque;
 using std::list;
 using std::max;

+using std::make_pair;

 using std::min;
 using std::min;

+using std::pair;

 using std::set;
 using std::vector;
 
 using std::set;
 using std::vector;
 


@@ -76,7 +77,6 @@ View::View(SigSession &session, QWidget *parent) :
        _viewport(new Viewport(*this)),
        _ruler(new Ruler(*this)),
        _header(new Header(*this)),
        _viewport(new Viewport(*this)),
        _ruler(new Ruler(*this)),
        _header(new Header(*this)),

-       _data_length(0),

        _scale(1e-6),
        _offset(0),
        _v_offset(0),
        _scale(1e-6),
        _offset(0),
        _v_offset(0),


@@ -161,31 +161,9 @@ void View::zoom(double steps, int offset)
 
 void View::zoom_fit()
 {
 
 void View::zoom_fit()
 {

-       using pv::data::SignalData;
-
-       const vector< shared_ptr<Signal> > sigs(
-               session().get_signals());
-
-       // Make a set of all the visible data objects
-       set< shared_ptr<SignalData> > visible_data;
-       BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
-               if (sig->enabled())
-                       visible_data.insert(sig->data());
-
-       if (visible_data.empty())
-               return;
-
-       double left_time = DBL_MAX, right_time = DBL_MIN;
-       BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
-       {
-               const double start_time = d->get_start_time();
-               left_time = min(left_time, start_time);
-               right_time = max(right_time, start_time +
-                       d->get_max_sample_count() / d->samplerate());
-       }
-
-       assert(left_time < right_time);
-       if (right_time - left_time < 1e-12)
+       const pair<double, double> extents = get_time_extents();
+       const double delta = extents.second - extents.first;
+       if (delta < 1e-12)

                return;
 
        assert(_viewport);
                return;
 
        assert(_viewport);


@@ -193,7 +171,7 @@ void View::zoom_fit()
        if (w <= 0)
                return;
 
        if (w <= 0)
                return;
 

-       set_scale_offset((right_time - left_time) / w, left_time);      
+       set_scale_offset(delta / w, extents.first);

 }
 
 void View::zoom_one_to_one()
 }
 
 void View::zoom_one_to_one()


@@ -284,6 +262,39 @@ list<weak_ptr<SelectableItem> > View::selected_items() const
        return items;
 }
 
        return items;
 }
 

+set< shared_ptr<SignalData> > View::get_visible_data() const
+{
+       const vector< shared_ptr<Signal> > sigs(
+               session().get_signals());
+
+       // Make a set of all the visible data objects
+       set< shared_ptr<SignalData> > visible_data;
+       BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
+               if (sig->enabled())
+                       visible_data.insert(sig->data());
+
+       return visible_data;
+}
+
+pair<double, double> View::get_time_extents() const
+{
+       const set< shared_ptr<SignalData> > visible_data = get_visible_data();
+       if (visible_data.empty())
+               return make_pair(0.0, 0.0);
+
+       double left_time = DBL_MAX, right_time = DBL_MIN;
+       BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
+       {
+               const double start_time = d->get_start_time();
+               left_time = min(left_time, start_time);
+               right_time = max(right_time, start_time +
+                       d->get_max_sample_count() / d->samplerate());
+       }
+
+       assert(left_time < right_time);
+       return make_pair(left_time, right_time);
+}
+

 bool View::cursors_shown() const
 {
        return _show_cursors;
 bool View::cursors_shown() const
 {
        return _show_cursors;


@@ -344,11 +355,8 @@ void View::update_viewport()
 
 void View::get_scroll_layout(double &length, double &offset) const
 {
 
 void View::get_scroll_layout(double &length, double &offset) const
 {

-       const shared_ptr<data::SignalData> sig_data = _session.get_data();
-       if (!sig_data)
-               return;
-
-       length = _data_length / (sig_data->samplerate() * _scale);
+       const pair<double, double> extents = get_time_extents();
+       length = (extents.second - extents.first) / _scale;

        offset = _offset / _scale;
 }
 
        offset = _offset / _scale;
 }
 


@@ -499,18 +507,6 @@ void View::signals_changed()
 
 void View::data_updated()
 {
 
 void View::data_updated()
 {

-       // Get the new data length
-       _data_length = 0;
-       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<data::LogicSnapshot> s, snapshots)
-                       if (s)
-                               _data_length = max(_data_length,
-                                       s->get_sample_count());
-       }
-

        // Update the scroll bars
        update_scroll();
 
        // Update the scroll bars
        update_scroll();
 

diff --git a/pv/view/view.h b/pv/view/view.h
index 6f1e87288bd1dd14f40568f86198ea39f0a3a7bc..62157eed76a5613e552571aa0a0e322be3a23c3a 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,6 +23,7 @@
 
 #include <stdint.h>
 
 
 #include <stdint.h>
 

+#include <set>

 #include <vector>
 
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
 #include <boost/shared_ptr.hpp>


@@ -31,6 +32,8 @@
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
 

+#include <pv/data/signaldata.h>
+

 #include "cursorpair.h"
 
 namespace pv {
 #include "cursorpair.h"
 
 namespace pv {


@@ -98,6 +101,11 @@ public:
 
        std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
 
 
        std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
 

+       std::set< boost::shared_ptr<pv::data::SignalData> >
+               get_visible_data() const;
+
+       std::pair<double, double> get_time_extents() const;
+

        /**
         * Returns true if cursors are displayed. false otherwise.
         */
        /**
         * Returns true if cursors are displayed. false otherwise.
         */


@@ -179,8 +187,6 @@ private:
        Ruler *_ruler;
        Header *_header;
 
        Ruler *_ruler;
        Header *_header;
 

-       uint64_t _data_length;
-

        /// The view time scale in seconds per pixel.
        double _scale;
 
        /// The view time scale in seconds per pixel.
        double _scale;