projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed pv::data::Analog::get_snapshots and Logic::get_snapshots
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index 8245186b97ab21af6b89d8d9f54e4137bbd519a6..dba99253eeb7a77f559f537cf7cf03b652adcbab 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-18,29
+18,46
@@
* 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>
-using namespace boost;
-using namespace std;
+#include "analog.hpp"
+#include "analogsnapshot.hpp"
+
+using std::deque;
+using std::max;
+using std::shared_ptr;
namespace pv {
namespace data {
namespace pv {
namespace data {
-Analog::Analog(const sr_datafeed_meta_analog&,
- uint64_t samplerate) :
- SignalData(samplerate)
+Analog::Analog() :
+ SignalData()
{
}
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_;
+}
+
+void Analog::clear()
+{
+ snapshots_.clear();
}
}
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+uint64_t Analog::get_max_sample_count() const
{
{
- return _snapshots;
+ uint64_t l = 0;
+ for (const std::shared_ptr<AnalogSnapshot> s : snapshots_) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
}
} // namespace data
}
} // namespace data