projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unify get_samples() semantics for AnalogSegment and LogicSegment
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index e23283ac2952e23c3f87f0945e7fc91c5ce6b970..9ba8f2c3d6e1a70ed761f88ea57d27dfff9d38a8 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-14,54
+14,60
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <cassert>
*/
#include <cassert>
-#include "logic.h"
-#include "logics
napshot.h
"
+#include "logic.h
pp
"
+#include "logics
egment.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 {
Logic::Logic(unsigned int num_channels) :
SignalData(),
namespace pv {
namespace data {
Logic::Logic(unsigned int num_channels) :
SignalData(),
-
_num_channels
(num_channels)
+
num_channels_
(num_channels)
{
{
- assert(
_num_channels
> 0);
+ assert(
num_channels_
> 0);
}
}
-
int Logic::get_
num_channels() const
+
unsigned int Logic::
num_channels() const
{
{
- return
_num_channels
;
+ return
num_channels_
;
}
}
-void Logic::push_s
napsho
t(
- shared_ptr<LogicS
napshot> &snapsho
t)
+void Logic::push_s
egmen
t(
+ shared_ptr<LogicS
egment> &segmen
t)
{
{
-
_snapshots.push_front(snapsho
t);
+
segments_.push_front(segmen
t);
}
}
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
{
{
- return _snapshots;
+ return segments_;
+}
+
+vector< shared_ptr<Segment> > Logic::segments() const
+{
+ return vector< shared_ptr<Segment> >(
+ segments_.begin(), segments_.end());
}
void Logic::clear()
{
}
void Logic::clear()
{
-
_snapshots
.clear();
+
segments_
.clear();
}
}
-uint64_t Logic::
get_
max_sample_count() const
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
{
uint64_t l = 0;
- for (std::shared_ptr<LogicS
napshot> s : _snapshots
) {
+ for (std::shared_ptr<LogicS
egment> s : segments_
) {
assert(s);
l = max(l, s->get_sample_count());
}
assert(s);
l = max(l, s->get_sample_count());
}