X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=1e66e364c7f6cfe2f71a3f6ea5ae64a1d5b17dc0;hb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;hp=a62d9e2f4dae7bca74e79d5f6ca04a3a6a7f87b0;hpb=26a883ede0bcf68d087eda5dd2082890d36c7aef;p=pulseview.git

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index a62d9e2..1e66e36 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -19,11 +19,12 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
 #include <cmath>
 
+#include "logic.hpp"
 #include "logicsegment.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -45,13 +46,15 @@ const int LogicSegment::MipMapScaleFactor = 1 << MipMapScalePower;
 const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSegment::MipMapDataUnit = 64*1024;	// bytes
 
-LogicSegment::LogicSegment(shared_ptr<Logic> logic, uint64_t samplerate) :
-	Segment(samplerate, logic->unit_size()),
+LogicSegment::LogicSegment(pv::data::Logic& owner, shared_ptr<sigrok::Logic> data,
+	uint64_t samplerate) :
+	Segment(samplerate, data->unit_size()),
+	owner_(owner),
 	last_append_sample_(0)
 {
 	lock_guard<recursive_mutex> lock(mutex_);
 	memset(mip_map_, 0, sizeof(mip_map_));
-	append_payload(logic);
+	append_payload(data);
 }
 
 LogicSegment::~LogicSegment()
@@ -135,18 +138,27 @@ void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
 #endif
 }
 
-void LogicSegment::append_payload(shared_ptr<Logic> logic)
+void LogicSegment::append_payload(shared_ptr<sigrok::Logic> logic)
 {
 	assert(unit_size_ == logic->unit_size());
 	assert((logic->data_length() % unit_size_) == 0);
 
 	lock_guard<recursive_mutex> lock(mutex_);
 
-	append_samples(logic->data_pointer(),
-		logic->data_length() / unit_size_);
+	uint64_t prev_sample_count = sample_count_;
+	uint64_t sample_count = logic->data_length() / unit_size_;
+
+	append_samples(logic->data_pointer(), sample_count);
 
 	// Generate the first mip-map from the data
 	append_payload_to_mipmap();
+
+	if (sample_count > 1)
+		owner_.notify_samples_added(this, prev_sample_count + 1,
+			prev_sample_count + 1 + sample_count);
+	else
+		owner_.notify_samples_added(this, prev_sample_count + 1,
+			prev_sample_count + 1);
 }
 
 const uint8_t* LogicSegment::get_samples(int64_t start_sample,
@@ -163,17 +175,17 @@ const uint8_t* LogicSegment::get_samples(int64_t start_sample,
 	return get_raw_samples(start_sample, (end_sample-start_sample));
 }
 
-SegmentLogicDataIterator* LogicSegment::begin_sample_iteration(uint64_t start) const
+SegmentLogicDataIterator* LogicSegment::begin_sample_iteration(uint64_t start)
 {
 	return (SegmentLogicDataIterator*)begin_raw_sample_iteration(start);
 }
 
-void LogicSegment::continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) const
+void LogicSegment::continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase)
 {
 	Segment::continue_raw_sample_iteration((SegmentRawDataIterator*)it, increase);
 }
 
-void LogicSegment::end_sample_iteration(SegmentLogicDataIterator* it) const
+void LogicSegment::end_sample_iteration(SegmentLogicDataIterator* it)
 {
 	Segment::end_raw_sample_iteration((SegmentRawDataIterator*)it);
 }