X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.cpp;h=a71d49ca6d27b9f2098a844b4c425c9fdfe765f3;hp=5022d6a900f7064c683c5f0d3ab9f80d5feeb100;hb=65c92359634f672e5f472a5214719dabc7e20883;hpb=8e9e525e01e9cb4d05912a7adce0e6f2f910b90a;ds=sidebyside

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 5022d6a9..a71d49ca 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -24,6 +24,8 @@
 #include <cstdlib>
 #include <cstring>
 
+#include <QDebug>
+
 using std::bad_alloc;
 using std::lock_guard;
 using std::min;
@@ -240,9 +242,9 @@ void Segment::get_raw_samples(uint64_t start, uint64_t count,
 	}
 }
 
-SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start)
+SegmentDataIterator* Segment::begin_sample_iteration(uint64_t start)
 {
-	SegmentRawDataIterator* it = new SegmentRawDataIterator;
+	SegmentDataIterator* it = new SegmentDataIterator;
 
 	assert(start < sample_count_);
 
@@ -252,17 +254,12 @@ SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start)
 	it->chunk_num = (start * unit_size_) / chunk_size_;
 	it->chunk_offs = (start * unit_size_) % chunk_size_;
 	it->chunk = data_chunks_[it->chunk_num];
-	it->value = it->chunk + it->chunk_offs;
 
 	return it;
 }
 
-void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase)
+void Segment::continue_sample_iteration(SegmentDataIterator* it, uint64_t increase)
 {
-	// Fail gracefully if we are asked to deliver data we don't have
-	if (it->sample_index > sample_count_)
-		return;
-
 	it->sample_index += increase;
 	it->chunk_offs += (increase * unit_size_);
 
@@ -271,11 +268,9 @@ void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t
 		it->chunk_offs -= chunk_size_;
 		it->chunk = data_chunks_[it->chunk_num];
 	}
-
-	it->value = it->chunk + it->chunk_offs;
 }
 
-void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
+void Segment::end_sample_iteration(SegmentDataIterator* it)
 {
 	delete it;
 
@@ -287,5 +282,12 @@ void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
 	}
 }
 
+uint8_t* Segment::get_iterator_value(SegmentDataIterator* it)
+{
+	assert(it->sample_index <= (sample_count_ - 1));
+
+	return (it->chunk + it->chunk_offs);
+}
+
 } // namespace data
 } // namespace pv