projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INSTALL: Fix incorrect gcc/clang minimum versions.
[pulseview.git]
/
pv
/
data
/
logicsegment.hpp
diff --git
a/pv/data/logicsegment.hpp
b/pv/data/logicsegment.hpp
index c450f0a905d9a96391e5ca759a65f06279acc225..3c012a45c3257bcf4c20be27256b3a243ba0cf2b 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,14
+74,15
@@
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,
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;
@@
-88,7
+93,7
@@
public:
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
void pack_sample(uint8_t *ptr, uint64_t value);
private:
uint64_t unpack_sample(const uint8_t *ptr) const;
void pack_sample(uint8_t *ptr, uint64_t value);
-
+
void reallocate_mipmap_level(MipMapLevel &m);
void append_payload_to_mipmap();
void reallocate_mipmap_level(MipMapLevel &m);
void append_payload_to_mipmap();
@@
-106,7
+111,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);