X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=c18575ad415559a8e66fa0fae7a6b65774a53c59;hb=89914a8657612761ff962ee973721a4872cda8d7;hp=b9612d0e04f3b3a02f84dc55c4a6c3d4ae823d86;hpb=f9274b6890511b0fc503603e499a6c124c47e731;p=pulseview.git

diff --git a/pv/session.cpp b/pv/session.cpp
index b9612d0..c18575a 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -677,16 +677,16 @@ double Session::get_samplerate() const
 	return samplerate;
 }
 
-int Session::get_segment_count() const
+uint32_t Session::get_segment_count() const
 {
-	int min_val = INT_MAX;
+	uint32_t value = 0;
 
-	// Find the lowest common number of segments
+	// Find the highest number of segments
 	for (shared_ptr<data::SignalData> data : all_signal_data_)
-		if (data->get_segment_count() < min_val)
-			min_val = data->get_segment_count();
+		if (data->get_segment_count() > value)
+			value = data->get_segment_count();
 
-	return (min_val != INT_MAX) ? min_val : 0;
+	return value;
 }
 
 const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
@@ -694,6 +694,17 @@ const unordered_set< shared_ptr<data::SignalBase> > Session::signalbases() const
 	return signalbases_;
 }
 
+bool Session::all_segments_complete(uint32_t segment_id) const
+{
+	bool all_complete = true;
+
+	for (shared_ptr<data::SignalBase> base : signalbases_)
+		if (!base->segment_is_complete(segment_id))
+			all_complete = false;
+
+	return all_complete;
+}
+
 #ifdef ENABLE_DECODE
 shared_ptr<data::DecodeSignal> Session::add_decode_signal()
 {
@@ -960,14 +971,14 @@ void Session::free_unused_memory()
 
 void Session::signal_new_segment()
 {
-	int new_segment_id = 1;
+	int new_segment_id = 0;
 
 	if ((cur_logic_segment_ != nullptr) || !cur_analog_segments_.empty()) {
 
 		// Determine new frame/segment number, assuming that all
 		// signals have the same number of frames/segments
 		if (cur_logic_segment_) {
-			new_segment_id = logic_data_->get_segment_count();
+			new_segment_id = logic_data_->get_segment_count() - 1;
 		} else {
 			shared_ptr<sigrok::Channel> any_channel =
 				(*cur_analog_segments_.begin()).first;
@@ -978,7 +989,7 @@ void Session::signal_new_segment()
 			shared_ptr<data::Analog> data(base->analog_data());
 			assert(data);
 
-			new_segment_id = data->get_segment_count();
+			new_segment_id = data->get_segment_count() - 1;
 		}
 	}
 
@@ -988,6 +999,27 @@ void Session::signal_new_segment()
 	}
 }
 
+void Session::signal_segment_completed()
+{
+	int segment_id = 0;
+
+	for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
+		// We only care about analog and logic channels, not derived ones
+		if (signalbase->type() == data::SignalBase::AnalogChannel) {
+			segment_id = signalbase->analog_data()->get_segment_count() - 1;
+			break;
+		}
+
+		if (signalbase->type() == data::SignalBase::LogicChannel) {
+			segment_id = signalbase->logic_data()->get_segment_count() - 1;
+			break;
+		}
+	}
+
+	if (segment_id >= 0)
+		segment_completed(segment_id);
+}
+
 void Session::feed_in_header()
 {
 	// Nothing to do here for now
@@ -1044,14 +1076,28 @@ void Session::feed_in_frame_begin()
 
 void Session::feed_in_frame_end()
 {
+	if (!frame_began_)
+		return;
+
 	{
 		lock_guard<recursive_mutex> lock(data_mutex_);
+
+		if (cur_logic_segment_)
+			cur_logic_segment_->set_complete();
+
+		for (auto entry : cur_analog_segments_) {
+			shared_ptr<data::AnalogSegment> segment = entry.second;
+			segment->set_complete();
+		}
+
 		cur_logic_segment_.reset();
 		cur_analog_segments_.clear();
 	}
 
 	if (frame_began_)
 		frame_began_ = false;
+
+	signal_segment_completed();
 }
 
 void Session::feed_in_logic(shared_ptr<Logic> logic)
@@ -1074,7 +1120,8 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 		// Create a new data segment
 		cur_logic_segment_ = make_shared<data::LogicSegment>(
-			*logic_data_, logic->unit_size(), cur_samplerate_);
+			*logic_data_, logic_data_->get_segment_count(),
+			logic->unit_size(), cur_samplerate_);
 		logic_data_->push_segment(cur_logic_segment_);
 
 		signal_new_segment();
@@ -1127,7 +1174,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 
 			// Create a segment, keep it in the maps of channels
 			segment = make_shared<data::AnalogSegment>(
-				*data, cur_samplerate_);
+				*data, data->get_segment_count(), cur_samplerate_);
 			cur_analog_segments_[channel] = segment;
 
 			// Push the segment into the analog data.