X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.hpp;h=e6c312ade78d3b7157b43cc2f9584ba283381edb;hb=7db61e770abd2d1c7eb326a09e35cd4266664c1d;hp=520f7168247222015896ae3deea7256cdfa115f6;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 520f716..e6c312a 100644
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -25,6 +25,8 @@
 #include <utility>
 #include <vector>
 
+#include <QObject>
+
 namespace AnalogSegmentTest {
 struct Basic;
 }
@@ -32,8 +34,18 @@ struct Basic;
 namespace pv {
 namespace data {
 
-class AnalogSegment : public Segment
+class Analog;
+
+typedef struct {
+	uint64_t sample_index, chunk_num, chunk_offs;
+	uint8_t* chunk;
+	float* value;
+} SegmentAnalogDataIterator;
+
+class AnalogSegment : public QObject, public Segment
 {
+	Q_OBJECT
+
 public:
 	struct EnvelopeSample
 	{
@@ -65,7 +77,7 @@ private:
 	static const uint64_t EnvelopeDataUnit;
 
 public:
-	AnalogSegment(uint64_t samplerate, uint64_t expected_num_samples = 0);
+	AnalogSegment(Analog& owner, uint64_t samplerate);
 
 	virtual ~AnalogSegment();
 
@@ -75,6 +87,12 @@ public:
 	const float* get_samples(int64_t start_sample,
 		int64_t end_sample) const;
 
+	const std::pair<float, float> get_min_max() const;
+
+	SegmentAnalogDataIterator* begin_sample_iteration(uint64_t start) const;
+	void continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const;
+	void end_sample_iteration(SegmentAnalogDataIterator* it) const;
+
 	void get_envelope_section(EnvelopeSection &s,
 		uint64_t start, uint64_t end, float min_length) const;
 
@@ -84,8 +102,12 @@ private:
 	void append_payload_to_envelope_levels();
 
 private:
+	Analog& owner_;
+
 	struct Envelope envelope_levels_[ScaleStepCount];
 
+	float min_value_, max_value_;
+
 	friend struct AnalogSegmentTest::Basic;
 };