projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 7b42e47497054c3fc6d359bf3ac860bb577fc09f..e23283ac2952e23c3f87f0945e7fc91c5ce6b970 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-18,25
+18,28
@@
* 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 <cassert>
+
#include "logic.h"
#include "logicsnapshot.h"
#include "logic.h"
#include "logicsnapshot.h"
-using namespace boost;
-using namespace std;
+using std::deque;
+using std::max;
+using std::shared_ptr;
namespace pv {
namespace data {
namespace pv {
namespace data {
-Logic::Logic(const sr_datafeed_meta_logic &meta,
- uint64_t samplerate) :
- SignalData(samplerate),
- _num_probes(meta.num_probes)
+Logic::Logic(unsigned int num_channels) :
+ SignalData(),
+ _num_channels(num_channels)
{
{
+ assert(_num_channels > 0);
}
}
-int Logic::get_num_
probe
s() const
+int Logic::get_num_
channel
s() const
{
{
- return _num_
probe
s;
+ return _num_
channel
s;
}
void Logic::push_snapshot(
}
void Logic::push_snapshot(
@@
-50,5
+53,20
@@
deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
return _snapshots;
}
return _snapshots;
}
+void Logic::clear()
+{
+ _snapshots.clear();
+}
+
+uint64_t Logic::get_max_sample_count() const
+{
+ uint64_t l = 0;
+ for (std::shared_ptr<LogicSnapshot> s : _snapshots) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
+}
+
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv