X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=a17ea693aaa89d67ca3859751529e84b75b42eb2;hp=831c8e7f90c41964dee9b2a496705ccd170db0ce;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hpb=5a9146acd1a3ec81ff74e108f50d5b2885ff21a1 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 831c8e7f..a17ea693 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -33,9 +33,7 @@ #include #include -using std::forward_list; using std::lock_guard; -using std::make_pair; using std::make_shared; using std::min; using std::out_of_range; @@ -58,7 +56,8 @@ DecodeSignal::DecodeSignal(pv::Session &session) : srd_session_(nullptr), logic_mux_data_invalid_(false), stack_config_changed_(true), - current_segment_id_(0) + current_segment_id_(0), + error_message_("") { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); @@ -85,9 +84,12 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder, bool restart_decode if ((stack_.empty()) || ((stack_.size() > 0) && (name() == prev_dec_name))) set_name(QString::fromUtf8(decoder->name)); - const shared_ptr dec = make_shared(decoder); + const shared_ptr dec = make_shared(decoder, stack_.size()); stack_.push_back(dec); + connect(dec.get(), SIGNAL(annotation_visibility_changed()), + this, SLOT(on_annotation_visibility_changed())); + // Include the newly created decode channels in the channel lists update_channel_list(); @@ -107,11 +109,12 @@ void DecodeSignal::remove_decoder(int index) assert(index < (int)stack_.size()); // Find the decoder in the stack - auto iter = stack_.begin(); - for (int i = 0; i < index; i++, iter++) - assert(iter != stack_.end()); + auto iter = stack_.begin() + index; + assert(iter != stack_.end()); + + shared_ptr dec = *iter; - decoder_removed(iter->get()); + decoder_removed(dec.get()); // Delete the element stack_.erase(iter); @@ -142,6 +145,8 @@ bool DecodeSignal::toggle_decoder_visibility(int index) void DecodeSignal::reset_decode(bool shutting_down) { + resume_decode(); // Make sure the decode thread isn't blocked by pausing + if (stack_config_changed_ || shutting_down) stop_srd_session(); else @@ -159,8 +164,6 @@ void DecodeSignal::reset_decode(bool shutting_down) logic_mux_thread_.join(); } - resume_decode(); // Make sure the decode thread isn't blocked by pausing - current_segment_id_ = 0; segments_.clear(); @@ -360,7 +363,7 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in begin_decode(); } -double DecodeSignal::samplerate() const +double DecodeSignal::get_samplerate() const { double result = 0; @@ -393,18 +396,20 @@ int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const for (const decode::DecodeChannel& ch : channels_) if (ch.assigned_signal) { + if (!ch.assigned_signal->logic_data()) + return 0; + no_signals_assigned = false; const shared_ptr logic_data = ch.assigned_signal->logic_data(); - if (!logic_data || logic_data->logic_segments().empty()) + if (logic_data->logic_segments().empty()) return 0; - try { - const shared_ptr segment = logic_data->logic_segments().at(segment_id); - count = min(count, (int64_t)segment->get_sample_count()); - } catch (out_of_range&) { + if (segment_id >= logic_data->logic_segments().size()) return 0; - } + + const shared_ptr segment = logic_data->logic_segments()[segment_id]; + count = min(count, (int64_t)segment->get_sample_count()); } return (no_signals_assigned ? 0 : count); @@ -479,7 +484,7 @@ uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) return rd->get_annotation_count(); } -void DecodeSignal::get_annotation_subset(vector &dest, +void DecodeSignal::get_annotation_subset(deque &dest, const Row* row, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const { @@ -501,44 +506,24 @@ void DecodeSignal::get_annotation_subset(vector &dest, rd->get_annotation_subset(dest, start_sample, end_sample); } -void DecodeSignal::get_annotation_subset(vector &dest, +void DecodeSignal::get_annotation_subset(deque &dest, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const { - // Use forward_lists for faster merging - forward_list *all_ann_list = new forward_list(); - - vector rows = get_rows(); - for (const Row* row : rows) { - vector *ann_vector = new vector(); - get_annotation_subset(*ann_vector, row, segment_id, start_sample, end_sample); - - forward_list *ann_list = - new forward_list(ann_vector->begin(), ann_vector->end()); - delete ann_vector; - - all_ann_list->merge(*ann_list); - delete ann_list; - } - - move(all_ann_list->begin(), all_ann_list->end(), back_inserter(dest)); - delete all_ann_list; + for (const Row* row : get_rows()) + get_annotation_subset(dest, row, segment_id, start_sample, end_sample); } uint32_t DecodeSignal::get_binary_data_chunk_count(uint32_t segment_id, const Decoder* dec, uint32_t bin_class_id) const { - if (segments_.size() == 0) + if ((segments_.size() == 0) || (segment_id >= segments_.size())) return 0; - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); + const DecodeSegment *segment = &(segments_[segment_id]); - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - return bc.chunks.size(); - } catch (out_of_range&) { - // Do nothing - } + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + return bc.chunks.size(); return 0; } @@ -547,18 +532,17 @@ void DecodeSignal::get_binary_data_chunk(uint32_t segment_id, const Decoder* dec, uint32_t bin_class_id, uint32_t chunk_id, const vector **dest, uint64_t *size) { - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); + if (segment_id >= segments_.size()) + return; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) { - if (dest) *dest = &(bc.chunks.at(chunk_id).data); - if (size) *size = bc.chunks.at(chunk_id).data.size(); - return; - } - } catch (out_of_range&) { - // Do nothing - } + const DecodeSegment *segment = &(segments_[segment_id]); + + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) { + if (dest) *dest = &(bc.chunks.at(chunk_id).data); + if (size) *size = bc.chunks.at(chunk_id).data.size(); + return; + } } void DecodeSignal::get_merged_binary_data_chunks_by_sample(uint32_t segment_id, @@ -567,39 +551,38 @@ void DecodeSignal::get_merged_binary_data_chunks_by_sample(uint32_t segment_id, { assert(dest != nullptr); - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); - - const DecodeBinaryClass* bin_class = nullptr; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - bin_class = &bc; - - // Determine overall size before copying to resize dest vector only once - uint64_t size = 0; - uint64_t matches = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) - if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { - size += chunk.data.size(); - matches++; - } - dest->resize(size); - - uint64_t offset = 0; - uint64_t matches2 = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) - if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { - memcpy(dest->data() + offset, chunk.data.data(), chunk.data.size()); - offset += chunk.data.size(); - matches2++; - - // Make sure we don't overwrite memory if the array grew in the meanwhile - if (matches2 == matches) - break; - } - } catch (out_of_range&) { - // Do nothing - } + if (segment_id >= segments_.size()) + return; + + const DecodeSegment *segment = &(segments_[segment_id]); + + const DecodeBinaryClass* bin_class = nullptr; + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + bin_class = &bc; + + // Determine overall size before copying to resize dest vector only once + uint64_t size = 0; + uint64_t matches = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) + if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { + size += chunk.data.size(); + matches++; + } + dest->resize(size); + + uint64_t offset = 0; + uint64_t matches2 = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) + if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { + memcpy(dest->data() + offset, chunk.data.data(), chunk.data.size()); + offset += chunk.data.size(); + matches2++; + + // Make sure we don't overwrite memory if the array grew in the meanwhile + if (matches2 == matches) + break; + } } void DecodeSignal::get_merged_binary_data_chunks_by_offset(uint32_t segment_id, @@ -608,58 +591,67 @@ void DecodeSignal::get_merged_binary_data_chunks_by_offset(uint32_t segment_id, { assert(dest != nullptr); - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); - - const DecodeBinaryClass* bin_class = nullptr; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - bin_class = &bc; - - // Determine overall size before copying to resize dest vector only once - uint64_t size = 0; - uint64_t offset = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { - if (offset >= start) - size += chunk.data.size(); - offset += chunk.data.size(); - if (offset >= end) - break; - } - dest->resize(size); - - offset = 0; - uint64_t dest_offset = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { - if (offset >= start) { - memcpy(dest->data() + dest_offset, chunk.data.data(), chunk.data.size()); - dest_offset += chunk.data.size(); - } - offset += chunk.data.size(); - if (offset >= end) - break; + if (segment_id >= segments_.size()) + return; + + const DecodeSegment *segment = &(segments_[segment_id]); + + const DecodeBinaryClass* bin_class = nullptr; + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + bin_class = &bc; + + // Determine overall size before copying to resize dest vector only once + uint64_t size = 0; + uint64_t offset = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { + if (offset >= start) + size += chunk.data.size(); + offset += chunk.data.size(); + if (offset >= end) + break; + } + dest->resize(size); + + offset = 0; + uint64_t dest_offset = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { + if (offset >= start) { + memcpy(dest->data() + dest_offset, chunk.data.data(), chunk.data.size()); + dest_offset += chunk.data.size(); } - } catch (out_of_range&) { - // Do nothing + offset += chunk.data.size(); + if (offset >= end) + break; } } const DecodeBinaryClass* DecodeSignal::get_binary_data_class(uint32_t segment_id, const Decoder* dec, uint32_t bin_class_id) const { - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); + if (segment_id >= segments_.size()) + return nullptr; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - return &bc; - } catch (out_of_range&) { - // Do nothing - } + const DecodeSegment *segment = &(segments_[segment_id]); + + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + return &bc; return nullptr; } +const deque* DecodeSignal::get_all_annotations_by_segment( + uint32_t segment_id) const +{ + if (segment_id >= segments_.size()) + return nullptr; + + const DecodeSegment *segment = &(segments_[segment_id]); + + return &(segment->all_annotations); +} + void DecodeSignal::save_settings(QSettings &settings) const { SignalBase::save_settings(settings); @@ -690,6 +682,24 @@ void DecodeSignal::save_settings(QSettings &settings) const i++; } + // Save row properties + i = 0; + for (const Row* row : decoder->get_rows()) { + settings.beginGroup("row" + QString::number(i)); + settings.setValue("visible", row->visible()); + settings.endGroup(); + i++; + } + + // Save class properties + i = 0; + for (const AnnotationClass* ann_class : decoder->ann_classes()) { + settings.beginGroup("ann_class" + QString::number(i)); + settings.setValue("visible", ann_class->visible()); + settings.endGroup(); + i++; + } + settings.endGroup(); } @@ -737,7 +747,10 @@ void DecodeSignal::restore_settings(QSettings &settings) continue; if (QString::fromUtf8(dec->id) == id) { - shared_ptr decoder = make_shared(dec); + shared_ptr decoder = make_shared(dec, stack_.size()); + + connect(decoder.get(), SIGNAL(annotation_visibility_changed()), + this, SLOT(on_annotation_visibility_changed())); stack_.push_back(decoder); decoder->set_visible(settings.value("visible", true).toBool()); @@ -755,6 +768,25 @@ void DecodeSignal::restore_settings(QSettings &settings) // Include the newly created decode channels in the channel lists update_channel_list(); + + // Restore row properties + int i = 0; + for (Row* row : decoder->get_rows()) { + settings.beginGroup("row" + QString::number(i)); + row->set_visible(settings.value("visible", true).toBool()); + settings.endGroup(); + i++; + } + + // Restore class properties + i = 0; + for (AnnotationClass* ann_class : decoder->ann_classes()) { + settings.beginGroup("ann_class" + QString::number(i)); + ann_class->set_visible(settings.value("visible", true).toBool()); + settings.endGroup(); + i++; + } + break; } } @@ -766,7 +798,7 @@ void DecodeSignal::restore_settings(QSettings &settings) // Restore channel mapping unsigned int channels = settings.value("channels").toInt(); - const unordered_set< shared_ptr > signalbases = + const vector< shared_ptr > signalbases = session_.signalbases(); for (unsigned int channel_id = 0; channel_id < channels; channel_id++) { @@ -783,7 +815,7 @@ void DecodeSignal::restore_settings(QSettings &settings) QString assigned_signal_name = settings.value("assigned_signal_name").toString(); for (const shared_ptr& signal : signalbases) - if (signal->name() == assigned_signal_name) + if ((signal->name() == assigned_signal_name) && (signal->type() != SignalBase::DecodeChannel)) channel->assigned_signal = signal.get(); channel->initial_pin_state = settings.value("initial_pin_state").toInt(); @@ -827,7 +859,7 @@ uint32_t DecodeSignal::get_input_segment_count() const return (no_signals_assigned ? 0 : count); } -uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const +double DecodeSignal::get_input_samplerate(uint32_t segment_id) const { double samplerate = 0; @@ -1097,7 +1129,6 @@ void DecodeSignal::logic_mux_proc() logic_mux_data_->push_segment(output_segment); output_segment->set_samplerate(get_input_samplerate(segment_id)); - } else { // All segments have been processed logic_mux_data_invalid_ = false; @@ -1360,10 +1391,10 @@ void DecodeSignal::connect_input_notifiers() void DecodeSignal::create_decode_segment() { // Create annotation segment - segments_.emplace_back(DecodeSegment()); + segments_.emplace_back(); // Add annotation classes - for (const shared_ptr dec : stack_) + for (const shared_ptr& dec : stack_) for (Row* row : dec->get_rows()) segments_.back().annotation_rows.emplace(row, RowData(row)); @@ -1388,6 +1419,9 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa if (ds->decode_interrupt_) return; + if (ds->segments_.empty()) + return; + lock_guard lock(ds->output_mutex_); // Get the decoder and the annotation data @@ -1416,8 +1450,67 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa if (!row) row = dec->get_row_by_id(0); - // Add the annotation - ds->segments_[ds->current_segment_id_].annotation_rows.at(row).emplace_annotation(pdata); + RowData& row_data = ds->segments_[ds->current_segment_id_].annotation_rows.at(row); + + // Add the annotation to the row + const Annotation* ann = row_data.emplace_annotation(pdata); + + // We insert the annotation into the global annotation list in a way so that + // the annotation list is sorted by start sample and length. Otherwise, we'd + // have to sort the model, which is expensive + deque& all_annotations = + ds->segments_[ds->current_segment_id_].all_annotations; + + if (all_annotations.empty()) { + all_annotations.emplace_back(ann); + } else { + const uint64_t new_ann_len = (pdata->end_sample - pdata->start_sample); + bool ann_has_earlier_start = (pdata->start_sample < all_annotations.back()->start_sample()); + bool ann_is_longer = (new_ann_len > + (all_annotations.back()->end_sample() - all_annotations.back()->start_sample())); + + if (ann_has_earlier_start && ann_is_longer) { + bool ann_has_same_start; + auto it = all_annotations.end(); + + do { + it--; + ann_has_earlier_start = (pdata->start_sample < (*it)->start_sample()); + ann_has_same_start = (pdata->start_sample == (*it)->start_sample()); + ann_is_longer = (new_ann_len > (*it)->length()); + } while ((ann_has_earlier_start || (ann_has_same_start && ann_is_longer)) && (it != all_annotations.begin())); + + // Allow inserting at the front + if (it != all_annotations.begin()) + it++; + + all_annotations.emplace(it, ann); + } else + all_annotations.emplace_back(ann); + } + + // When emplace_annotation() inserts instead of appends an annotation, + // the pointers in all_annotations that follow the inserted annotation and + // point to annotations for this row are off by one and must be updated + if (&(row_data.annotations().back()) != ann) { + // Search backwards until we find the annotation we just added + auto row_it = row_data.annotations().end(); + auto all_it = all_annotations.end(); + do { + all_it--; + if ((*all_it)->row_data() == &row_data) + row_it--; + } while (&(*row_it) != ann); + + // Update the annotation addresses for this row's annotations until the end + do { + if ((*all_it)->row_data() == &row_data) { + *all_it = &(*row_it); + row_it++; + } + all_it++; + } while (all_it != all_annotations.end()); + } } void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal) @@ -1497,5 +1590,10 @@ void DecodeSignal::on_data_received() logic_mux_cond_.notify_one(); } +void DecodeSignal::on_annotation_visibility_changed() +{ + annotation_visibility_changed(); +} + } // namespace data } // namespace pv