projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalData: Added snapshots accessor method
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index 53fa9a5a62b117c5a1258cdc09dd05d1fc1cf446..3f96dae1afe566e61d512176d4d1cf2d6fbdd08d 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-18,12
+18,15
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "analog.h"
-#include "analogsnapshot.h"
+#include <cassert>
+
+#include "analog.hpp"
+#include "analogsnapshot.hpp"
using std::deque;
using std::max;
using std::shared_ptr;
using std::deque;
using std::max;
using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-35,23
+38,29
@@
Analog::Analog() :
void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
{
void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
{
- _snapshots.push_front(snapshot);
+ snapshots_.push_front(snapshot);
+}
+
+const deque< shared_ptr<AnalogSnapshot> >& Analog::analog_snapshots() const
+{
+ return snapshots_;
}
}
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+vector< shared_ptr<Snapshot> > Analog::snapshots() const
{
{
- return _snapshots;
+ return vector< shared_ptr<Snapshot> >(
+ snapshots_.begin(), snapshots_.end());
}
void Analog::clear()
{
}
void Analog::clear()
{
-
_snapshots
.clear();
+
snapshots_
.clear();
}
uint64_t Analog::get_max_sample_count() const
{
uint64_t l = 0;
}
uint64_t Analog::get_max_sample_count() const
{
uint64_t l = 0;
- for (const std::shared_ptr<AnalogSnapshot> s :
_snapshots
) {
+ for (const std::shared_ptr<AnalogSnapshot> s :
snapshots_
) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}