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;
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;
}
}
}
}
+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
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)