X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=f423b21ef9a009caa04202109882666e2b6d0fb4;hp=700b221b3b9d12c94bc1f9b64cc4877743cc69c4;hb=3cc9ad7b867853315473df611612c562d562ed8a;hpb=53e35b2d7e81fa8b57ba2bacc8bf445291195150 diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 700b221b..f423b21e 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -22,6 +22,8 @@ extern "C" { #include } +#include + #include #include @@ -37,24 +39,28 @@ extern "C" { #include #include -#include "decodetrace.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include "decodetrace.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using boost::shared_lock; +using boost::shared_mutex; using std::dynamic_pointer_cast; using std::list; +using std::lock_guard; using std::make_pair; using std::max; +using std::make_pair; using std::map; using std::min; using std::pair; @@ -117,26 +123,25 @@ const QColor DecodeTrace::OutlineColours[16] = { QColor(0x6B, 0x23, 0x37) }; -DecodeTrace::DecodeTrace(pv::SigSession &session, +DecodeTrace::DecodeTrace(pv::Session &session, std::shared_ptr decoder_stack, int index) : Trace(QString::fromUtf8( decoder_stack->stack().front()->decoder()->name)), - _session(session), - _decoder_stack(decoder_stack), - _text_height(0), - _row_height(0), - _delete_mapper(this), - _show_hide_mapper(this) + session_(session), + decoder_stack_(decoder_stack), + row_height_(0), + delete_mapper_(this), + show_hide_mapper_(this) { - assert(_decoder_stack); + assert(decoder_stack_); - _colour = DecodeColours[index % countof(DecodeColours)]; + colour_ = DecodeColours[index % countof(DecodeColours)]; - connect(_decoder_stack.get(), SIGNAL(new_decode_data()), + connect(decoder_stack_.get(), SIGNAL(new_decode_data()), this, SLOT(on_new_decode_data())); - connect(&_delete_mapper, SIGNAL(mapped(int)), + connect(&delete_mapper_, SIGNAL(mapped(int)), this, SLOT(on_delete_decoder(int))); - connect(&_show_hide_mapper, SIGNAL(mapped(int)), + connect(&show_hide_mapper_, SIGNAL(mapped(int)), this, SLOT(on_show_hide_decoder(int))); } @@ -147,48 +152,50 @@ bool DecodeTrace::enabled() const const std::shared_ptr& DecodeTrace::decoder() const { - return _decoder_stack; + return decoder_stack_; } -void DecodeTrace::set_view(pv::view::View *view) +pair DecodeTrace::v_extents() const { - assert(view); - Trace::set_view(view); + /// @todo Replace this with an implementation that knows the true + /// height of the trace + const int row_height = (ViewItemPaintParams::text_height() * 6) / 4; + return make_pair(-row_height / 2, row_height * 7 / 2); } -void DecodeTrace::paint_back(QPainter &p, int left, int right) +void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - Trace::paint_back(p, left, right); - paint_axis(p, get_y(), left, right); + Trace::paint_back(p, pp); + paint_axis(p, pp, get_visual_y()); } -void DecodeTrace::paint_mid(QPainter &p, int left, int right) +void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - QFontMetrics m(QApplication::font()); - _text_height = m.boundingRect(QRect(), 0, "Tg").height(); - _row_height = (_text_height * 6) / 4; - const int annotation_height = (_text_height * 5) / 4; + const int text_height = ViewItemPaintParams::text_height(); + row_height_ = (text_height * 6) / 4; + const int annotation_height = (text_height * 5) / 4; - assert(_decoder_stack); - const QString err = _decoder_stack->error_message(); + assert(decoder_stack_); + const QString err = decoder_stack_->error_message(); if (!err.isEmpty()) { - draw_unresolved_period(p, annotation_height, left, right); - draw_error(p, err, left, right); + draw_unresolved_period( + p, annotation_height, pp.left(), pp.right()); + draw_error(p, err, pp); return; } // Iterate through the rows - assert(_view); - int y = get_y(); - pair sample_range = get_sample_range(left, right); + int y = get_visual_y(); + pair sample_range = get_sample_range( + pp.left(), pp.right()); - assert(_decoder_stack); - const vector rows(_decoder_stack->get_visible_rows()); + assert(decoder_stack_); + const vector rows(decoder_stack_->get_visible_rows()); - _visible_rows.clear(); + visible_rows_.clear(); for (size_t i = 0; i < rows.size(); i++) { const Row &row = rows[i]; @@ -200,34 +207,31 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right) base_colour >>= 16; vector annotations; - _decoder_stack->get_annotation_subset(annotations, row, + decoder_stack_->get_annotation_subset(annotations, row, sample_range.first, sample_range.second); if (!annotations.empty()) { for (const Annotation &a : annotations) - draw_annotation(a, p, get_text_colour(), - annotation_height, left, right, y, - base_colour); - y += _row_height; + draw_annotation(a, p, annotation_height, + pp, y, base_colour); + y += row_height_; - _visible_rows.push_back(rows[i]); + visible_rows_.push_back(rows[i]); } } // Draw the hatching - draw_unresolved_period(p, annotation_height, left, right); + draw_unresolved_period(p, annotation_height, pp.left(), pp.right()); } -void DecodeTrace::paint_fore(QPainter &p, int left, int right) +void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - (void)right; + assert(row_height_); - assert(_row_height); - - for (size_t i = 0; i < _visible_rows.size(); i++) + for (size_t i = 0; i < visible_rows_.size(); i++) { - const int y = i * _row_height + get_y(); + const int y = i * row_height_ + get_visual_y(); p.setPen(QPen(Qt::NoPen)); p.setBrush(QApplication::palette().brush(QPalette::WindowText)); @@ -235,16 +239,16 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right) if (i != 0) { const QPointF points[] = { - QPointF(left, y - ArrowSize), - QPointF(left + ArrowSize, y), - QPointF(left, y + ArrowSize) + QPointF(pp.left(), y - ArrowSize), + QPointF(pp.left() + ArrowSize, y), + QPointF(pp.left(), y + ArrowSize) }; p.drawPolygon(points, countof(points)); } - const QRect r(left + ArrowSize * 2, y - _row_height / 2, - right - left, _row_height); - const QString h(_visible_rows[i].title()); + const QRect r(pp.left() + ArrowSize * 2, y - row_height_ / 2, + pp.right() - pp.left(), row_height_); + const QString h(visible_rows_[i].title()); const int f = Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip; @@ -267,17 +271,17 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) assert(form); assert(parent); - assert(_decoder_stack); + assert(decoder_stack_); // Add the standard options Trace::populate_popup_form(parent, form); // Add the decoder options - _bindings.clear(); - _channel_selectors.clear(); - _decoder_forms.clear(); + bindings_.clear(); + channel_selectors_.clear(); + decoder_forms_.clear(); - const list< shared_ptr >& stack = _decoder_stack->stack(); + const list< shared_ptr >& stack = decoder_stack_->stack(); if (stack.empty()) { @@ -328,7 +332,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent) } void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, - QPainter &p, QColor text_color, int h, int left, int right, int y, + QPainter &p, int h, const ViewItemPaintParams &pp, int y, size_t base_colour) const { double samples_per_pixel, pixels_offset; @@ -344,19 +348,17 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a, const QColor &fill = Colours[colour]; const QColor &outline = OutlineColours[colour]; - if (start > right + DrawPadding || end < left - DrawPadding) + if (start > pp.right() + DrawPadding || end < pp.left() - DrawPadding) return; if (a.start_sample() == a.end_sample()) - draw_instant(a, p, fill, outline, text_color, h, - start, y); + draw_instant(a, p, fill, outline, h, start, y); else - draw_range(a, p, fill, outline, text_color, h, - start, end, y); + draw_range(a, p, fill, outline, h, start, end, y); } void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, QColor text_color, int h, double x, int y) const + QColor fill, QColor outline, int h, double x, int y) const { const QString text = a.annotations().empty() ? QString() : a.annotations().back(); @@ -368,12 +370,12 @@ void DecodeTrace::draw_instant(const pv::data::decode::Annotation &a, QPainter & p.setBrush(fill); p.drawRoundedRect(rect, h / 2, h / 2); - p.setPen(text_color); + p.setPen(Qt::black); p.drawText(rect, Qt::AlignCenter | Qt::AlignVCenter, text); } void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, - QColor fill, QColor outline, QColor text_color, int h, double start, + QColor fill, QColor outline, int h, double start, double end, int y) const { const double top = y + .5 - h / 2; @@ -411,7 +413,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, if (rect.width() <= 4) return; - p.setPen(text_color); + p.setPen(Qt::black); // Try to find an annotation that will fit QString best_annotation; @@ -432,15 +434,15 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, } void DecodeTrace::draw_error(QPainter &p, const QString &message, - int left, int right) + const ViewItemPaintParams &pp) { - const int y = get_y(); + const int y = get_visual_y(); p.setPen(ErrorBgColour.darker()); p.setBrush(ErrorBgColour); const QRectF bounding_rect = - QRectF(left, INT_MIN / 2 + y, right - left, INT_MAX); + QRectF(pp.width(), INT_MIN / 2 + y, pp.width(), INT_MAX); const QRectF text_rect = p.boundingRect(bounding_rect, Qt::AlignCenter, message); const float r = text_rect.height() / 4; @@ -448,7 +450,7 @@ void DecodeTrace::draw_error(QPainter &p, const QString &message, p.drawRoundedRect(text_rect.adjusted(-r, -r, r, r), r, r, Qt::AbsoluteSize); - p.setPen(get_text_colour()); + p.setPen(Qt::black); p.drawText(text_rect, message); } @@ -460,37 +462,37 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, double samples_per_pixel, pixels_offset; - assert(_decoder_stack); + assert(decoder_stack_); shared_ptr data; shared_ptr logic_signal; - const list< shared_ptr > &stack = _decoder_stack->stack(); + const list< shared_ptr > &stack = decoder_stack_->stack(); // We get the logic data of the first channel in the list. // This works because we are currently assuming all - // LogicSignals have the same data/snapshot + // LogicSignals have the same data/segment for (const shared_ptr &dec : stack) if (dec && !dec->channels().empty() && ((logic_signal = (*dec->channels().begin()).second)) && ((data = logic_signal->logic_data()))) break; - if (!data || data->get_snapshots().empty()) + if (!data || data->logic_segments().empty()) return; - const shared_ptr snapshot = - data->get_snapshots().front(); - assert(snapshot); - const int64_t sample_count = (int64_t)snapshot->get_sample_count(); + const shared_ptr segment = + data->logic_segments().front(); + assert(segment); + const int64_t sample_count = (int64_t)segment->get_sample_count(); if (sample_count == 0) return; - const int64_t samples_decoded = _decoder_stack->samples_decoded(); + const int64_t samples_decoded = decoder_stack_->samples_decoded(); if (sample_count == samples_decoded) return; - const int y = get_y(); + const int y = get_visual_y(); tie(pixels_offset, samples_per_pixel) = get_pixels_offset_samples_per_pixel(); @@ -512,16 +514,19 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, pair DecodeTrace::get_pixels_offset_samples_per_pixel() const { - assert(_view); - assert(_decoder_stack); + assert(owner_); + assert(decoder_stack_); + + const View *view = owner_->view(); + assert(view); - const double scale = _view->scale(); + const double scale = view->scale(); assert(scale > 0); const double pixels_offset = - (_view->offset() - _decoder_stack->get_start_time()) / scale; + (view->offset() - decoder_stack_->start_time()) / scale; - double samplerate = _decoder_stack->samplerate(); + double samplerate = decoder_stack_->samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) @@ -547,11 +552,18 @@ pair DecodeTrace::get_sample_range( int DecodeTrace::get_row_at_point(const QPoint &point) { - if (!_row_height) + if (!row_height_) + return -1; + + const int y = (point.y() - get_visual_y() + row_height_ / 2); + + /* Integer divison of (x-1)/x would yield 0, so we check for this. */ + if (y < 0) return -1; - const int row = (point.y() - get_y() + _row_height / 2) / _row_height; - if (row < 0 || row >= (int)_visible_rows.size()) + const int row = y / row_height_; + + if (row >= (int)visible_rows_.size()) return -1; return row; @@ -572,29 +584,28 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) vector annotations; - assert(_decoder_stack); - _decoder_stack->get_annotation_subset(annotations, _visible_rows[row], + assert(decoder_stack_); + decoder_stack_->get_annotation_subset(annotations, visible_rows_[row], sample_range.first, sample_range.second); return (annotations.empty()) ? QString() : annotations[0].annotations().front(); } -void DecodeTrace::hide_hover_annotation() -{ - QToolTip::hideText(); -} - void DecodeTrace::hover_point_changed() { - QPoint hp = _view->hover_point(); + assert(owner_); + + const View *const view = owner_->view(); + assert(view); + + QPoint hp = view->hover_point(); QString ann = get_annotation_at_point(hp); - assert(_view); - assert(_row_height); + assert(view); - if (ann.isEmpty()) { - hide_hover_annotation(); + if (!row_height_ || ann.isEmpty()) { + QToolTip::hideText(); return; } @@ -613,10 +624,11 @@ void DecodeTrace::hover_point_changed() // decode trace, not below. hp.setX(hp.x() - (text_size.width() / 2) - padding); - hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height) - - _row_height - text_size.height()); + hp.setY(get_visual_y() - (row_height_ / 2) + + (hover_row * row_height_) - + row_height_ - text_size.height() - padding); - QToolTip::showText(_view->viewport()->mapToGlobal(hp), ann); + QToolTip::showText(view->viewport()->mapToGlobal(hp), ann); } void DecodeTrace::create_decoder_form(int index, @@ -634,12 +646,12 @@ void DecodeTrace::create_decoder_form(int index, QString::fromUtf8(decoder->name)); group->set_decoder_visible(dec->shown()); - _delete_mapper.setMapping(group, index); - connect(group, SIGNAL(delete_decoder()), &_delete_mapper, SLOT(map())); + delete_mapper_.setMapping(group, index); + connect(group, SIGNAL(delete_decoder()), &delete_mapper_, SLOT(map())); - _show_hide_mapper.setMapping(group, index); + show_hide_mapper_.setMapping(group, index); connect(group, SIGNAL(show_hide_decoder()), - &_show_hide_mapper, SLOT(map())); + &show_hide_mapper_, SLOT(map())); QFormLayout *const decoder_form = new QFormLayout; group->add_layout(decoder_form); @@ -656,7 +668,7 @@ void DecodeTrace::create_decoder_form(int index, .arg(QString::fromUtf8(pdch->desc)), combo); const ChannelSelector s = {combo, dec, pdch}; - _channel_selectors.push_back(s); + channel_selectors_.push_back(s); } // Add the optional channels @@ -671,18 +683,18 @@ void DecodeTrace::create_decoder_form(int index, .arg(QString::fromUtf8(pdch->desc)), combo); const ChannelSelector s = {combo, dec, pdch}; - _channel_selectors.push_back(s); + channel_selectors_.push_back(s); } // Add the options - shared_ptr binding( - new prop::binding::DecoderOptions(_decoder_stack, dec)); + shared_ptr binding( + new binding::Decoder(decoder_stack_, dec)); binding->add_properties_to_form(decoder_form, true); - _bindings.push_back(binding); + bindings_.push_back(binding); form->addRow(group); - _decoder_forms.push_back(group); + decoder_forms_.push_back(group); } QComboBox* DecodeTrace::create_channel_selector( @@ -691,9 +703,10 @@ QComboBox* DecodeTrace::create_channel_selector( { assert(dec); - const vector< shared_ptr > sigs = _session.get_signals(); + shared_lock lock(session_.signals_mutex()); + const vector< shared_ptr > &sigs(session_.signals()); - assert(_decoder_stack); + assert(decoder_stack_); const auto channel_iter = dec->channels().find(pdch); QComboBox *selector = new QComboBox(parent); @@ -709,7 +722,7 @@ QComboBox* DecodeTrace::create_channel_selector( if (dynamic_pointer_cast(s) && s->enabled()) { - selector->addItem(s->get_name(), + selector->addItem(s->name(), qVariantFromValue((void*)s.get())); if ((*channel_iter).second == s) selector->setCurrentIndex(i + 1); @@ -724,20 +737,22 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec assert(dec); map > channel_map; - const vector< shared_ptr > sigs = _session.get_signals(); - for (const ChannelSelector &s : _channel_selectors) + shared_lock lock(session_.signals_mutex()); + const vector< shared_ptr > &sigs(session_.signals()); + + for (const ChannelSelector &s : channel_selectors_) { - if(s._decoder != dec) + if(s.decoder_ != dec) break; const LogicSignal *const selection = - (LogicSignal*)s._combo->itemData( - s._combo->currentIndex()).value(); + (LogicSignal*)s.combo_->itemData( + s.combo_->currentIndex()).value(); for (shared_ptr sig : sigs) if(sig.get() == selection) { - channel_map[s._pdch] = + channel_map[s.pdch_] = dynamic_pointer_cast(sig); break; } @@ -748,17 +763,17 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec void DecodeTrace::commit_channels() { - assert(_decoder_stack); - for (shared_ptr dec : _decoder_stack->stack()) + assert(decoder_stack_); + for (shared_ptr dec : decoder_stack_->stack()) commit_decoder_channels(dec); - _decoder_stack->begin_decode(); + decoder_stack_->begin_decode(); } void DecodeTrace::on_new_decode_data() { - if (_view) - _view->update_viewport(); + if (owner_) + owner_->row_item_appearance_changed(false, true); } void DecodeTrace::delete_pressed() @@ -768,7 +783,7 @@ void DecodeTrace::delete_pressed() void DecodeTrace::on_delete() { - _session.remove_decode_signal(this); + session_.remove_decode_signal(this); } void DecodeTrace::on_channel_selected(int) @@ -779,29 +794,29 @@ void DecodeTrace::on_channel_selected(int) void DecodeTrace::on_stack_decoder(srd_decoder *decoder) { assert(decoder); - assert(_decoder_stack); - _decoder_stack->push(shared_ptr( + assert(decoder_stack_); + decoder_stack_->push(shared_ptr( new data::decode::Decoder(decoder))); - _decoder_stack->begin_decode(); + decoder_stack_->begin_decode(); create_popup_form(); } void DecodeTrace::on_delete_decoder(int index) { - _decoder_stack->remove(index); + decoder_stack_->remove(index); // Update the popup create_popup_form(); - _decoder_stack->begin_decode(); + decoder_stack_->begin_decode(); } void DecodeTrace::on_show_hide_decoder(int index) { using pv::data::decode::Decoder; - const list< shared_ptr > stack(_decoder_stack->stack()); + const list< shared_ptr > stack(decoder_stack_->stack()); // Find the decoder in the stack auto iter = stack.cbegin(); @@ -814,10 +829,11 @@ void DecodeTrace::on_show_hide_decoder(int index) const bool show = !dec->shown(); dec->show(show); - assert(index < (int)_decoder_forms.size()); - _decoder_forms[index]->set_decoder_visible(show); + assert(index < (int)decoder_forms_.size()); + decoder_forms_[index]->set_decoder_visible(show); - _view->update_viewport(); + if (owner_) + owner_->row_item_appearance_changed(false, true); } } // namespace view