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 4317d44d5922b71a76aa598aa4af2b2530e8fc1d..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(unsigned int num_
probe
s) :
+Logic::Logic(unsigned int num_
channel
s) :
SignalData(),
SignalData(),
- _num_
probes(num_probe
s)
+ _num_
channels(num_channel
s)
{
{
- assert(_num_
probe
s > 0);
+ assert(_num_
channel
s > 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(
@@
-55,5
+58,15
@@
void Logic::clear()
_snapshots.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