X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=5944fd6430876471f1976c3e992318fc9419ae86;hp=c5fa6e91611f0c062fe08754762ccf012048a094;hb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index c5fa6e91..5944fd64 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -56,6 +56,8 @@ extern "C" { using boost::shared_lock; using boost::shared_mutex; + +using std::all_of; using std::dynamic_pointer_cast; using std::list; using std::lock_guard; @@ -64,8 +66,10 @@ using std::max; using std::make_pair; using std::map; using std::min; +using std::out_of_range; using std::pair; using std::shared_ptr; +using std::make_shared; using std::tie; using std::unordered_set; using std::vector; @@ -136,8 +140,7 @@ DecodeTrace::DecodeTrace(pv::Session &session, delete_mapper_(this), show_hide_mapper_(this) { - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); // Determine shortest string we want to see displayed in full QFontMetrics m(QApplication::font()); @@ -159,7 +162,7 @@ bool DecodeTrace::enabled() const return true; } -std::shared_ptr DecodeTrace::base() const +shared_ptr DecodeTrace::base() const { return base_; } @@ -184,8 +187,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); const int text_height = ViewItemPaintParams::text_height(); row_height_ = (text_height * 6) / 4; @@ -216,7 +218,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) int row_title_width; try { row_title_width = row_title_widths_.at(row); - } catch (std::out_of_range) { + } catch (out_of_range) { const int w = p.boundingRect(QRectF(), 0, row.title()).width() + RowTitleMargin; row_title_widths_[row] = w; @@ -250,7 +252,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) owner_->extents_changed(false, true); // Update the maximum row count if needed - max_visible_rows_ = std::max(max_visible_rows_, (int)visible_rows_.size()); + max_visible_rows_ = max(max_visible_rows_, (int)visible_rows_.size()); } void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp) @@ -297,8 +299,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form) { using pv::data::decode::Decoder; - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); assert(form); assert(parent); @@ -487,7 +488,7 @@ void DecodeTrace::draw_annotation_block( // Check if all annotations are of the same type (i.e. we can use one color) // or if we should use a neutral color (i.e. gray) const int format = annotations.front().format(); - const bool single_format = std::all_of( + const bool single_format = all_of( annotations.begin(), annotations.end(), [&](const Annotation &a) { return a.format() == format; }); @@ -546,8 +547,8 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p, const int ann_start = start + cap_width; const int ann_end = end - cap_width; - const int real_start = std::max(ann_start, pp.left() + row_title_width); - const int real_end = std::min(ann_end, pp.right()); + const int real_start = max(ann_start, pp.left() + row_title_width); + const int real_end = min(ann_end, pp.right()); const int real_width = real_end - real_start; QRectF rect(real_start, y - h / 2, real_width, h); @@ -603,8 +604,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, double samples_per_pixel, pixels_offset; - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); assert(decoder_stack); @@ -658,8 +658,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, pair DecodeTrace::get_pixels_offset_samples_per_pixel() const { - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); assert(owner_); assert(decoder_stack); @@ -731,8 +730,7 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) vector annotations; - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); assert(decoder_stack); decoder_stack->get_annotation_subset(annotations, visible_rows_[row], @@ -840,8 +838,7 @@ void DecodeTrace::create_decoder_form(int index, channel_selectors_.push_back(s); } - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); // Add the options shared_ptr binding( @@ -863,7 +860,7 @@ QComboBox* DecodeTrace::create_channel_selector( const auto sigs(session_.signalbases()); vector< shared_ptr > sig_list(sigs.begin(), sigs.end()); - std::sort(sig_list.begin(), sig_list.end(), + sort(sig_list.begin(), sig_list.end(), [](const shared_ptr &a, const shared_ptr &b) { return strnatcasecmp(a->name().toStdString(), @@ -880,7 +877,7 @@ QComboBox* DecodeTrace::create_channel_selector( for (const shared_ptr &b : sig_list) { assert(b); - if (b->type() == sigrok::ChannelType::LOGIC && b->enabled()) { + if (b->type() == data::SignalBase::LogicChannel && b->enabled()) { selector->addItem(b->name(), qVariantFromValue((void*)b.get())); @@ -923,8 +920,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec void DecodeTrace::commit_channels() { - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); assert(decoder_stack); for (shared_ptr dec : decoder_stack->stack()) @@ -956,13 +952,11 @@ void DecodeTrace::on_channel_selected(int) void DecodeTrace::on_stack_decoder(srd_decoder *decoder) { - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); assert(decoder); assert(decoder_stack); - decoder_stack->push(shared_ptr( - new data::decode::Decoder(decoder))); + decoder_stack->push(make_shared(decoder)); decoder_stack->begin_decode(); create_popup_form(); @@ -970,8 +964,7 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder) void DecodeTrace::on_delete_decoder(int index) { - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); decoder_stack->remove(index); @@ -985,8 +978,7 @@ void DecodeTrace::on_show_hide_decoder(int index) { using pv::data::decode::Decoder; - std::shared_ptr decoder_stack = - base_->decoder_stack(); + shared_ptr decoder_stack = base_->decoder_stack(); const list< shared_ptr > stack(decoder_stack->stack());