projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Make get_segment_count() consider all segments
[pulseview.git]
/
pv
/
data
/
logicsegment.hpp
diff --git
a/pv/data/logicsegment.hpp
b/pv/data/logicsegment.hpp
index 3c012a45c3257bcf4c20be27256b3a243ba0cf2b..2e03fd55585a99f8adbe4e22e753a3aae0fcf9e5 100644
(file)
--- a/
pv/data/logicsegment.hpp
+++ b/
pv/data/logicsegment.hpp
@@
-54,7
+54,7
@@
typedef struct {
uint8_t* value;
} SegmentLogicDataIterator;
uint8_t* value;
} SegmentLogicDataIterator;
-class LogicSegment : public
QObject, public
Segment
+class LogicSegment : public Segment
{
Q_OBJECT
{
Q_OBJECT
@@
-77,14
+77,15
@@
public:
typedef pair<int64_t, bool> EdgePair;
public:
typedef pair<int64_t, bool> EdgePair;
public:
- LogicSegment(pv::data::Logic& owner, unsigned int unit_size, uint64_t samplerate);
+ LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
+ unsigned int unit_size, uint64_t samplerate);
virtual ~LogicSegment();
void append_payload(shared_ptr<sigrok::Logic> logic);
void append_payload(void *data, uint64_t data_size);
virtual ~LogicSegment();
void append_payload(shared_ptr<sigrok::Logic> logic);
void append_payload(void *data, uint64_t data_size);
-
const uint8_t* get_samples(int64_t start_sample, int64_t end_sample
) const;
+
void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest
) const;
SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);
SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);