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
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 4317d44d5922b71a76aa598aa4af2b2530e8fc1d..8b864f7672fb352f65a8cf1ffd59693f4cf210cf 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-18,41
+18,54
@@
* 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 "logic.h"
-#include "logicsnapshot.h"
+#include <cassert>
-using namespace boost;
-using namespace std;
+#include "logic.hpp"
+#include "logicsnapshot.hpp"
+
+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_probes
> 0);
+ assert(
num_channels_
> 0);
}
}
-int Logic::get_num_
probe
s() const
+int Logic::get_num_
channel
s() const
{
{
- return
_num_probes
;
+ return
num_channels_
;
}
void Logic::push_snapshot(
shared_ptr<LogicSnapshot> &snapshot)
{
}
void Logic::push_snapshot(
shared_ptr<LogicSnapshot> &snapshot)
{
-
_snapshots
.push_front(snapshot);
+
snapshots_
.push_front(snapshot);
}
}
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+const deque< shared_ptr<LogicSnapshot> >& Logic::logic_snapshots() const
{
{
- return
_snapshots
;
+ return
snapshots_
;
}
void Logic::clear()
{
}
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 data