projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSegment: Make constructor and append_payload() more generic
[pulseview.git]
/
pv
/
data
/
logicsegment.hpp
diff --git
a/pv/data/logicsegment.hpp
b/pv/data/logicsegment.hpp
index a7a38ebefa7761a7929073272d5e7dcabf1b0361..c7971726fe667a192a295c578f8ce07dcb64f5a8 100644
(file)
--- a/
pv/data/logicsegment.hpp
+++ b/
pv/data/logicsegment.hpp
@@
-27,6
+27,10
@@
#include <QObject>
#include <QObject>
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
namespace sigrok {
class Logic;
}
namespace sigrok {
class Logic;
}
@@
-70,20
+74,22
@@
private:
static const uint64_t MipMapDataUnit;
public:
static const uint64_t MipMapDataUnit;
public:
- typedef
std::
pair<int64_t, bool> EdgePair;
+ typedef pair<int64_t, bool> EdgePair;
public:
public:
- LogicSegment(pv::data::Logic& owner, std::shared_ptr<sigrok::Logic> data, uint64_t samplerate);
+ LogicSegment(pv::data::Logic& owner, shared_ptr<sigrok::Logic> data, uint64_t samplerate);
+ LogicSegment(pv::data::Logic& owner, unsigned int unit_size, uint64_t samplerate);
virtual ~LogicSegment();
virtual ~LogicSegment();
- void append_payload(std::shared_ptr<sigrok::Logic> logic);
+ 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;
const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
- SegmentLogicDataIterator* begin_sample_iteration(uint64_t start)
const
;
- void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase)
const
;
- void end_sample_iteration(SegmentLogicDataIterator* it)
const
;
+ SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
+ void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);
+ void end_sample_iteration(SegmentLogicDataIterator* it);
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
@@
-106,7
+112,7
@@
public:
* can be resolved at this level of detail.
* @param[in] sig_index The index of the signal.
*/
* can be resolved at this level of detail.
* @param[in] sig_index The index of the signal.
*/
- void get_subsampled_edges(
std::
vector<EdgePair> &edges,
+ void get_subsampled_edges(vector<EdgePair> &edges,
uint64_t start, uint64_t end,
float min_length, int sig_index);
uint64_t start, uint64_t end,
float min_length, int sig_index);