X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=605cc05c65fd8ab234f5509d5885f30f276f805d;hp=a44c6f9916f3b326a05e932950cee0acfacedf40;hb=4d08da71e288c7b7be6c0455c0bb6834d4b318fd;hpb=341d9a7975be53bb44af8d2deeba9b4a5e086929 diff --git a/pv/session.cpp b/pv/session.cpp index a44c6f99..605cc05c 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -988,6 +988,27 @@ void Session::signal_new_segment() } } +void Session::signal_segment_completed() +{ + int segment_id = 0; + + for (shared_ptr 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 +1065,28 @@ void Session::feed_in_frame_begin() void Session::feed_in_frame_end() { + if (!frame_began_) + return; + { lock_guard lock(data_mutex_); + + if (cur_logic_segment_) + cur_logic_segment_->set_complete(); + + for (auto entry : cur_analog_segments_) { + shared_ptr 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)