From: Soeren Apel Date: Fri, 10 Jan 2020 21:19:57 +0000 (+0100) Subject: Minor decode refactorizations X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=462941e2626cef9855e810abdb0458e99ee1c5f1 Minor decode refactorizations --- diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp index 55caa2d7..e32dcc9f 100644 --- a/pv/data/decode/annotation.cpp +++ b/pv/data/decode/annotation.cpp @@ -42,15 +42,51 @@ Annotation::Annotation(const srd_proto_data *const pdata, const Row *row) : (const srd_proto_data_annotation*)pdata->data; assert(pda); - ann_class_ = (Class)(pda->ann_class); + ann_class_id_ = (Class)(pda->ann_class); + + annotations_ = new vector(); const char *const *annotations = (char**)pda->ann_text; while (*annotations) { - annotations_.push_back(QString::fromUtf8(*annotations)); + annotations_->push_back(QString::fromUtf8(*annotations)); annotations++; } - annotations_.shrink_to_fit(); + annotations_->shrink_to_fit(); +} + +Annotation::Annotation(Annotation&& a) : + start_sample_(a.start_sample_), + end_sample_(a.end_sample_), + annotations_(a.annotations_), + row_(a.row_), + ann_class_id_(a.ann_class_id_) +{ + a.annotations_ = nullptr; +} + +Annotation& Annotation::operator=(Annotation&& a) +{ + if (&a != this) { + if (annotations_) + delete annotations_; + + start_sample_ = a.start_sample_; + end_sample_ = a.end_sample_; + annotations_ = a.annotations_; + row_ = a.row_; + ann_class_id_ = a.ann_class_id_; + + a.annotations_ = nullptr; + } + + return *this; +} + +Annotation::~Annotation() +{ + if (annotations_) + delete annotations_; } uint64_t Annotation::start_sample() const @@ -63,12 +99,12 @@ uint64_t Annotation::end_sample() const return end_sample_; } -Annotation::Class Annotation::ann_class() const +Annotation::Class Annotation::ann_class_id() const { - return ann_class_; + return ann_class_id_; } -const vector& Annotation::annotations() const +const vector* Annotation::annotations() const { return annotations_; } diff --git a/pv/data/decode/annotation.hpp b/pv/data/decode/annotation.hpp index 8b91c4f4..1bb9ad34 100644 --- a/pv/data/decode/annotation.hpp +++ b/pv/data/decode/annotation.hpp @@ -42,11 +42,14 @@ public: public: Annotation(const srd_proto_data *const pdata, const Row *row); + Annotation(Annotation&& a); + Annotation& operator=(Annotation&& a); + ~Annotation(); uint64_t start_sample() const; uint64_t end_sample() const; - Class ann_class() const; - const vector& annotations() const; + Class ann_class_id() const; + const vector* annotations() const; const Row* row() const; bool operator<(const Annotation &other) const; @@ -54,9 +57,9 @@ public: private: uint64_t start_sample_; uint64_t end_sample_; - Class ann_class_; - vector annotations_; + vector* annotations_; const Row *row_; + Class ann_class_id_; }; } // namespace decode diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp index 80d56aab..7b6ec2d3 100644 --- a/pv/data/decode/rowdata.cpp +++ b/pv/data/decode/rowdata.cpp @@ -49,7 +49,7 @@ uint64_t RowData::get_annotation_count() const } void RowData::get_annotation_subset( - vector &dest, + deque &dest, uint64_t start_sample, uint64_t end_sample) const { // Determine whether we must apply per-class filtering or not @@ -68,7 +68,6 @@ void RowData::get_annotation_subset( if (all_ann_classes_enabled) { // No filtering, send everyting out as-is - dest.reserve(dest.size() + annotations_.size()); for (const auto& annotation : annotations_) if ((annotation.end_sample() > start_sample) && (annotation.start_sample() <= end_sample)) @@ -82,9 +81,8 @@ void RowData::get_annotation_subset( if (c->visible) class_visible[c->id] = 1; - dest.reserve(dest.size() + annotations_.size()); for (const auto& annotation : annotations_) - if ((class_visible[annotation.ann_class()]) && + if ((class_visible[annotation.ann_class_id()]) && (annotation.end_sample() > start_sample) && (annotation.start_sample() <= end_sample)) dest.push_back(&annotation); @@ -110,7 +108,7 @@ void RowData::emplace_annotation(srd_proto_data *pdata) if (it != annotations_.begin()) it++; - annotations_.insert(it, Annotation(pdata, row_)); + annotations_.emplace(it, pdata, row_); } else { annotations_.emplace_back(pdata, row_); prev_ann_start_sample_ = pdata->start_sample; diff --git a/pv/data/decode/rowdata.hpp b/pv/data/decode/rowdata.hpp index 4454d691..01ea94f4 100644 --- a/pv/data/decode/rowdata.hpp +++ b/pv/data/decode/rowdata.hpp @@ -49,8 +49,7 @@ public: * Note: The annotations are unsorted and only annotations that fully * fit into the sample range are considered. */ - void get_annotation_subset( - vector &dest, + void get_annotation_subset(deque &dest, uint64_t start_sample, uint64_t end_sample) const; void emplace_annotation(srd_proto_data *pdata); diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index fdf55b73..3420fa1c 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -478,7 +478,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 { @@ -500,27 +500,11 @@ 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, diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp index c59b20b8..cee4ccf0 100644 --- a/pv/data/decodesignal.hpp +++ b/pv/data/decodesignal.hpp @@ -149,7 +149,7 @@ public: * Note: The annotations may be unsorted and only annotations that fully * fit into the sample range are considered. */ - void get_annotation_subset(vector &dest, const Row* row, + void get_annotation_subset(deque &dest, const Row* row, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; /** @@ -157,7 +157,7 @@ public: * Note: The annotations may be unsorted and only annotations that fully * fit into the sample range are considered. */ - void get_annotation_subset(vector &dest, uint32_t segment_id, + void get_annotation_subset(deque &dest, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const; uint32_t get_binary_data_chunk_count(uint32_t segment_id, diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index bb0843a5..9f8b7481 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -286,7 +286,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) continue; } - vector annotations; + deque annotations; decode_signal_->get_annotation_subset(annotations, r.decode_row, current_segment_, sample_range.first, sample_range.second); @@ -665,7 +665,7 @@ void DecodeTrace::mouse_left_press_event(const QMouseEvent* event) } } -void DecodeTrace::draw_annotations(vector annotations, +void DecodeTrace::draw_annotations(deque& annotations, QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row) { Annotation::Class block_class = 0; @@ -698,7 +698,7 @@ void DecodeTrace::draw_annotations(vector annotations, // Annotation wider than the threshold for a useful label width? if (a_width >= min_useful_label_width_) { - for (const QString &ann_text : a->annotations()) { + for (const QString &ann_text : *(a->annotations())) { const qreal w = p.boundingRect(QRectF(), 0, ann_text).width(); // Annotation wide enough to fit a label? Don't put it in a block then if (w <= a_width) { @@ -733,10 +733,10 @@ void DecodeTrace::draw_annotations(vector annotations, if (block_ann_count == 0) { block_start = a_start; - block_class = a->ann_class(); + block_class = a->ann_class_id(); block_class_uniform = true; } else - if (a->ann_class() != block_class) + if (a->ann_class_id() != block_class) block_class_uniform = false; block_ann_count++; @@ -760,11 +760,10 @@ void DecodeTrace::draw_annotation(const Annotation* a, QPainter &p, const double start = a->start_sample() / samples_per_pixel - pixels_offset; const double end = a->end_sample() / samples_per_pixel - pixels_offset; - QColor color = row.ann_class_color.at(a->ann_class()); - p.setPen(color.darker()); - p.setBrush(color); + p.setPen(row.ann_class_dark_color.at(a->ann_class_id())); + p.setBrush(row.ann_class_color.at(a->ann_class_id())); - if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) + if ((start > (pp.right() + DrawPadding)) || (end < (pp.left() - DrawPadding))) return; if (a->start_sample() == a->end_sample()) @@ -779,33 +778,32 @@ void DecodeTrace::draw_annotation_block(qreal start, qreal end, { const double top = y + .5 - annotation_height_ / 2; const double bottom = y + .5 + annotation_height_ / 2; - - const QRectF rect(start, top, end - start, bottom - top); - const int r = annotation_height_ / 4; - - p.setPen(QPen(Qt::NoPen)); - p.setBrush(Qt::white); - p.drawRoundedRect(rect, r, r); + const double width = end - start; // If all annotations in this block are of the same type, we can use the // one format that all of these annotations have. Otherwise, we should use // a neutral color (i.e. gray) if (use_ann_format) { - const QColor color = row.ann_class_color.at(ann_class); - p.setPen(color.darker()); - p.setBrush(QBrush(color, Qt::Dense4Pattern)); + p.setPen(row.ann_class_dark_color.at(ann_class)); + p.setBrush(QBrush(row.ann_class_color.at(ann_class), Qt::Dense4Pattern)); } else { - p.setPen(Qt::gray); + p.setPen(QColor(Qt::darkGray)); p.setBrush(QBrush(Qt::gray, Qt::Dense4Pattern)); } - p.drawRoundedRect(rect, r, r); + if (width <= 1) + p.drawLine(QPointF(start, top), QPointF(start, bottom)); + else { + const QRectF rect(start, top, width, bottom - top); + const int r = annotation_height_ / 4; + p.drawRoundedRect(rect, r, r); + } } void DecodeTrace::draw_instant(const Annotation* a, QPainter &p, qreal x, int y) const { - const QString text = a->annotations().empty() ? - QString() : a->annotations().back(); + const QString text = a->annotations()->empty() ? + QString() : a->annotations()->back(); const qreal w = min((qreal)p.boundingRect(QRectF(), 0, text).width(), 0.0) + annotation_height_; const QRectF rect(x - w / 2, y - annotation_height_ / 2, w, annotation_height_); @@ -822,7 +820,7 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, { const qreal top = y + .5 - annotation_height_ / 2; const qreal bottom = y + .5 + annotation_height_ / 2; - const vector annotations = a->annotations(); + const vector* annotations = a->annotations(); // If the two ends are within 1 pixel, draw a vertical line if (start + 1.0 > end) { @@ -843,7 +841,7 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, p.drawConvexPolygon(pts, countof(pts)); - if (annotations.empty()) + if (annotations->empty()) return; const int ann_start = start + cap_width; @@ -863,14 +861,14 @@ void DecodeTrace::draw_range(const Annotation* a, QPainter &p, QString best_annotation; int best_width = 0; - for (const QString &s : annotations) { + for (const QString &s : *annotations) { const int w = p.boundingRect(QRectF(), 0, s).width(); if (w <= rect.width() && w > best_width) best_annotation = s, best_width = w; } if (best_annotation.isEmpty()) - best_annotation = annotations.back(); + best_annotation = annotations->back(); // If not ellide the last in the list p.drawText(rect, Qt::AlignCenter, p.fontMetrics().elidedText( @@ -1047,13 +1045,13 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) if (point.y() > (int)(get_row_y(r) + (annotation_height_ / 2))) return QString(); - vector annotations; + deque annotations; decode_signal_->get_annotation_subset(annotations, r->decode_row, current_segment_, sample_range.first, sample_range.second); return (annotations.empty()) ? - QString() : annotations[0]->annotations().front(); + QString() : annotations[0]->annotations()->front(); } void DecodeTrace::create_decoder_form(int index, shared_ptr &dec, @@ -1178,7 +1176,7 @@ QComboBox* DecodeTrace::create_channel_selector_init_state(QWidget *parent, return selector; } -void DecodeTrace::export_annotations(vector *annotations) const +void DecodeTrace::export_annotations(deque& annotations) const { GlobalSettings settings; const QString dir = settings.value("MainWindow/SaveDirectory").toString(); @@ -1197,18 +1195,18 @@ void DecodeTrace::export_annotations(vector *annotations) con if (file.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { QTextStream out_stream(&file); - for (const Annotation* ann : *annotations) { + for (const Annotation* ann : annotations) { const QString sample_range = QString("%1-%2") \ .arg(QString::number(ann->start_sample()), QString::number(ann->end_sample())); const QString row_name = quote + ann->row()->description() + quote; QString all_ann_text; - for (const QString &s : ann->annotations()) + for (const QString &s : *(ann->annotations())) all_ann_text = all_ann_text + quote + s + quote + ","; all_ann_text.chop(1); - const QString first_ann_text = quote + ann->annotations().front() + quote; + const QString first_ann_text = quote + ann->annotations()->front() + quote; QString out_text = format; out_text = out_text.replace("%s", sample_range); @@ -1350,9 +1348,12 @@ void DecodeTrace::update_rows() nr.row_color = get_row_color(decode_row->index()); vector ann_classes = decode_row->ann_classes(); - for (const AnnotationClass* ann_class : ann_classes) + for (const AnnotationClass* ann_class : ann_classes) { nr.ann_class_color[ann_class->id] = get_annotation_color(nr.row_color, ann_class->id); + nr.ann_class_dark_color[ann_class->id] = + nr.ann_class_color[ann_class->id].darker(); + } rows_.push_back(nr); r = &rows_.back(); @@ -1602,21 +1603,19 @@ void DecodeTrace::on_copy_annotation_to_clipboard() if (!selected_row_) return; - vector *annotations = new vector(); + deque annotations; - decode_signal_->get_annotation_subset(*annotations, selected_row_, + decode_signal_->get_annotation_subset(annotations, selected_row_, current_segment_, selected_sample_range_.first, selected_sample_range_.first); - if (annotations->empty()) + if (annotations.empty()) return; QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(annotations->front()->annotations().front(), QClipboard::Clipboard); + clipboard->setText(annotations.front()->annotations()->front(), QClipboard::Clipboard); if (clipboard->supportsSelection()) - clipboard->setText(annotations->front()->annotations().front(), QClipboard::Selection); - - delete annotations; + clipboard->setText(annotations.front()->annotations()->front(), QClipboard::Selection); } void DecodeTrace::on_export_row() @@ -1688,29 +1687,26 @@ void DecodeTrace::on_export_row_from_here() if (!selected_row_) return; - vector *annotations = new vector(); + deque annotations; - decode_signal_->get_annotation_subset(*annotations, selected_row_, + decode_signal_->get_annotation_subset(annotations, selected_row_, current_segment_, selected_sample_range_.first, selected_sample_range_.second); - if (annotations->empty()) + if (annotations.empty()) return; export_annotations(annotations); - delete annotations; } void DecodeTrace::on_export_all_rows_from_here() { - vector *annotations = new vector(); + deque annotations; - decode_signal_->get_annotation_subset(*annotations, current_segment_, + decode_signal_->get_annotation_subset(annotations, current_segment_, selected_sample_range_.first, selected_sample_range_.second); - if (!annotations->empty()) + if (!annotations.empty()) export_annotations(annotations); - - delete annotations; } void DecodeTrace::on_animation_timer() diff --git a/pv/views/trace/decodetrace.hpp b/pv/views/trace/decodetrace.hpp index 9877dc11..83f3a084 100644 --- a/pv/views/trace/decodetrace.hpp +++ b/pv/views/trace/decodetrace.hpp @@ -101,6 +101,7 @@ struct DecodeTraceRow { QColor row_color; map ann_class_color; + map ann_class_dark_color; }; class ContainerWidget : public QWidget @@ -185,7 +186,7 @@ public: virtual void mouse_left_press_event(const QMouseEvent* event); private: - void draw_annotations(vector annotations, QPainter &p, + void draw_annotations(deque& annotations, QPainter &p, const ViewItemPaintParams &pp, int y, const DecodeTraceRow& row); void draw_annotation(const Annotation* a, QPainter &p, @@ -233,7 +234,7 @@ private: QComboBox* create_channel_selector_init_state(QWidget *parent, const data::decode::DecodeChannel *ch); - void export_annotations(vector *annotations) const; + void export_annotations(deque& annotations) const; void initialize_row_widgets(DecodeTraceRow* r, unsigned int row_id); void update_rows();