projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceView: Only perform "always zoom to fit" for the main view
[pulseview.git]
/
pv
/
data
/
logicsegment.hpp
diff --git
a/pv/data/logicsegment.hpp
b/pv/data/logicsegment.hpp
index 0931e2c46c9f6ed86a9c1d8f8706c8477cc56a26..c450f0a905d9a96391e5ca759a65f06279acc225 100644
(file)
--- a/
pv/data/logicsegment.hpp
+++ b/
pv/data/logicsegment.hpp
@@
-25,6
+25,8
@@
#include <utility>
#include <vector>
#include <utility>
#include <vector>
+#include <QObject>
+
namespace sigrok {
class Logic;
}
namespace sigrok {
class Logic;
}
@@
-40,8
+42,18
@@
struct LongPulses;
namespace pv {
namespace data {
namespace pv {
namespace data {
-class LogicSegment : public Segment
+class Logic;
+
+typedef struct {
+ uint64_t sample_index, chunk_num, chunk_offs;
+ uint8_t* chunk;
+ uint8_t* value;
+} SegmentLogicDataIterator;
+
+class LogicSegment : public QObject, public Segment
{
{
+ Q_OBJECT
+
private:
struct MipMapLevel
{
private:
struct MipMapLevel
{
@@
-61,8
+73,7
@@
public:
typedef std::pair<int64_t, bool> EdgePair;
public:
typedef std::pair<int64_t, bool> EdgePair;
public:
- LogicSegment(std::shared_ptr<sigrok::Logic> logic,
- uint64_t samplerate, uint64_t expected_num_samples = 0);
+ LogicSegment(pv::data::Logic& owner, std::shared_ptr<sigrok::Logic> data, uint64_t samplerate);
virtual ~LogicSegment();
virtual ~LogicSegment();
@@
-70,6
+81,10
@@
public:
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);
+ 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;
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);
@@
-78,7
+93,7
@@
private:
void append_payload_to_mipmap();
void append_payload_to_mipmap();
- uint64_t get_sample(uint64_t index) const;
+ uint64_t get_
unpacked_
sample(uint64_t index) const;
public:
/**
public:
/**
@@
-101,6
+116,8
@@
private:
static uint64_t pow2_ceil(uint64_t x, unsigned int power);
private:
static uint64_t pow2_ceil(uint64_t x, unsigned int power);
private:
+ Logic& owner_;
+
struct MipMapLevel mip_map_[ScaleStepCount];
uint64_t last_append_sample_;
struct MipMapLevel mip_map_[ScaleStepCount];
uint64_t last_append_sample_;