X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=63d15314cdcf23470261f72a82dafedde51619e3;hp=69c495e609fafd84b8113e274b3d270305240ff8;hb=30bb6ca0a51a601c3bee8f53ccbbc7479aebf2d5;hpb=eae6e30af53f6b3e42dc5be212c82870078276b0 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 69c495e6..63d15314 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -25,22 +25,25 @@ #include +#include #include #include -#include "logicsignal.h" -#include "view.h" +#include "logicsignal.hpp" +#include "view.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include using std::deque; using std::max; +using std::make_pair; using std::min; using std::pair; using std::shared_ptr; @@ -48,7 +51,6 @@ using std::vector; using sigrok::Channel; using sigrok::ConfigKey; -using sigrok::Device; using sigrok::Error; using sigrok::Trigger; using sigrok::TriggerStage; @@ -77,33 +79,50 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; +QColor LogicSignal::TriggerMarkerBackgroundColour = QColor(0xED, 0xD4, 0x00); +const int LogicSignal::TriggerMarkerPadding = 2; +const char* LogicSignal::TriggerMarkerIcons[8] = { + nullptr, + ":/icons/trigger-marker-low.svg", + ":/icons/trigger-marker-high.svg", + ":/icons/trigger-marker-rising.svg", + ":/icons/trigger-marker-falling.svg", + ":/icons/trigger-marker-change.svg", + nullptr, + nullptr +}; + +QCache LogicSignal::icon_cache_; +QCache LogicSignal::pixmap_cache_; + LogicSignal::LogicSignal( - pv::SigSession &session, - shared_ptr device, + pv::Session &session, + shared_ptr device, shared_ptr channel, shared_ptr data) : Signal(session, channel), - _device(device), - _data(data), - _trigger_none(NULL), - _trigger_rising(NULL), - _trigger_high(NULL), - _trigger_falling(NULL), - _trigger_low(NULL), - _trigger_change(NULL) + signal_height_(QFontMetrics(QApplication::font()).height() * 2), + device_(device), + data_(data), + trigger_none_(nullptr), + trigger_rising_(nullptr), + trigger_high_(nullptr), + trigger_falling_(nullptr), + trigger_low_(nullptr), + trigger_change_(nullptr) { shared_ptr trigger; - _colour = SignalColours[channel->index() % countof(SignalColours)]; + colour_ = SignalColours[channel->index() % countof(SignalColours)]; /* Populate this channel's trigger setting with whatever we * find in the current session trigger, if anything. */ - _trigger_match = nullptr; - if ((trigger = _session.session()->trigger())) + trigger_match_ = nullptr; + if ((trigger = session_.session()->trigger())) for (auto stage : trigger->stages()) for (auto match : stage->matches()) - if (match->channel() == _channel) - _trigger_match = match->type(); + if (match->channel() == channel_) + trigger_match_ = match->type(); } LogicSignal::~LogicSignal() @@ -112,74 +131,90 @@ LogicSignal::~LogicSignal() shared_ptr LogicSignal::data() const { - return _data; + return data_; } shared_ptr LogicSignal::logic_data() const { - return _data; + return data_; } -void LogicSignal::paint_back(QPainter &p, int left, int right) +void LogicSignal::set_logic_data(std::shared_ptr data) { - if (_channel->enabled()) - paint_axis(p, get_y(), left, right); + data_ = data; } -void LogicSignal::paint_mid(QPainter &p, int left, int right) +std::pair LogicSignal::v_extents() const { - using pv::view::View; + const int signal_margin = + QFontMetrics(QApplication::font()).height() / 2; + return make_pair(-signal_height_ - signal_margin, signal_margin); +} - QLineF *line; +int LogicSignal::scale_handle_offset() const +{ + return -signal_height_; +} - vector< pair > edges; +void LogicSignal::scale_handle_dragged(int offset) +{ + const int font_height = QFontMetrics(QApplication::font()).height(); + const int units = (-offset / font_height); + signal_height_ = ((units < 1) ? 1 : units) * font_height; +} - assert(_channel); - assert(_data); - assert(right >= left); - assert(_owner); +void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) +{ + if (channel_->enabled()) + paint_axis(p, pp, get_visual_y()); +} - const int y = get_y(); +void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) +{ + QLineF *line; + + vector< pair > edges; - const View *const view = _owner->view(); - assert(view); - - const double scale = view->scale(); - assert(scale > 0); + assert(channel_); + assert(data_); + assert(owner_); - const double offset = view->offset(); + const int y = get_visual_y(); - if (!_channel->enabled()) + if (!channel_->enabled()) return; - const float high_offset = y - View::SignalHeight + 0.5f; + const float high_offset = y - signal_height_ + 0.5f; const float low_offset = y + 0.5f; - const deque< shared_ptr > &snapshots = - _data->get_snapshots(); - if (snapshots.empty()) + const deque< shared_ptr > &segments = + data_->logic_segments(); + if (segments.empty()) return; - const shared_ptr &snapshot = - snapshots.front(); + const shared_ptr &segment = + segments.front(); - double samplerate = _data->samplerate(); + double samplerate = segment->samplerate(); // Show sample rate as 1Hz when it is unknown if (samplerate == 0.0) samplerate = 1.0; - const double pixels_offset = offset / scale; - const double start_time = _data->get_start_time(); - const int64_t last_sample = snapshot->get_sample_count() - 1; - const double samples_per_pixel = samplerate * scale; - const double start = samplerate * (offset - start_time); - const double end = start + samples_per_pixel * (right - left); - - snapshot->get_subsampled_edges(edges, - min(max((int64_t)floor(start), (int64_t)0), last_sample), - min(max((int64_t)ceil(end), (int64_t)0), last_sample), - samples_per_pixel / Oversampling, _channel->index()); + const double pixels_offset = pp.pixels_offset(); + const pv::util::Timestamp& start_time = segment->start_time(); + const int64_t last_sample = segment->get_sample_count() - 1; + const double samples_per_pixel = samplerate * pp.scale(); + const pv::util::Timestamp start = samplerate * (pp.offset() - start_time); + const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); + + const int64_t start_sample = min(max(floor(start).convert_to(), + (int64_t)0), last_sample); + const uint64_t end_sample = min(max(ceil(end).convert_to(), + (int64_t)0), last_sample); + + segment->get_subsampled_edges(edges, start_sample, end_sample, + samples_per_pixel / Oversampling, channel_->index()); assert(edges.size() >= 2); // Paint the edges @@ -189,7 +224,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right) for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) { const float x = ((*i).first / samples_per_pixel - - pixels_offset) + left; + pixels_offset) + pp.left(); *line++ = QLineF(x, high_offset, x, low_offset); } @@ -203,14 +238,51 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right) p.setPen(HighColour); paint_caps(p, cap_lines, edges, true, samples_per_pixel, - pixels_offset, left, high_offset); + pixels_offset, pp.left(), high_offset); p.setPen(LowColour); paint_caps(p, cap_lines, edges, false, samples_per_pixel, - pixels_offset, left, low_offset); + pixels_offset, pp.left(), low_offset); delete[] cap_lines; } +void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp) +{ + // Draw the trigger marker + if (!trigger_match_ || !channel_->enabled()) + return; + + const int y = get_visual_y(); + const vector trig_types = get_trigger_types(); + for (int32_t type_id : trig_types) { + const TriggerMatchType *const type = + TriggerMatchType::get(type_id); + if (trigger_match_ != type || type_id < 0 || + (size_t)type_id >= countof(TriggerMarkerIcons) || + !TriggerMarkerIcons[type_id]) + continue; + + const QPixmap *const pixmap = get_pixmap( + TriggerMarkerIcons[type_id]); + if (!pixmap) + continue; + + const float pad = TriggerMarkerPadding - 0.5f; + const QSize size = pixmap->size(); + const QPoint point( + pp.right() - size.width() - pad * 2, + y - (signal_height_ + size.height()) / 2); + + p.setPen(QPen(TriggerMarkerBackgroundColour.darker())); + p.setBrush(TriggerMarkerBackgroundColour); + p.drawRoundedRect(QRectF(point, size).adjusted( + -pad, -pad, pad, pad), pad, pad); + p.drawPixmap(point, *pixmap); + + break; + } +} + void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, vector< pair > &edges, bool level, double samples_per_pixel, double pixels_offset, float x_offset, @@ -232,58 +304,79 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, void LogicSignal::init_trigger_actions(QWidget *parent) { - _trigger_none = new QAction(QIcon(":/icons/trigger-none.svg"), + trigger_none_ = new QAction(*get_icon(":/icons/trigger-none.svg"), tr("No trigger"), parent); - _trigger_none->setCheckable(true); - connect(_trigger_none, SIGNAL(triggered()), this, SLOT(on_trigger())); + trigger_none_->setCheckable(true); + connect(trigger_none_, SIGNAL(triggered()), this, SLOT(on_trigger())); - _trigger_rising = new QAction(QIcon(":/icons/trigger-rising.svg"), + trigger_rising_ = new QAction(*get_icon(":/icons/trigger-rising.svg"), tr("Trigger on rising edge"), parent); - _trigger_rising->setCheckable(true); - connect(_trigger_rising, SIGNAL(triggered()), this, SLOT(on_trigger())); + trigger_rising_->setCheckable(true); + connect(trigger_rising_, SIGNAL(triggered()), this, SLOT(on_trigger())); - _trigger_high = new QAction(QIcon(":/icons/trigger-high.svg"), + trigger_high_ = new QAction(*get_icon(":/icons/trigger-high.svg"), tr("Trigger on high level"), parent); - _trigger_high->setCheckable(true); - connect(_trigger_high, SIGNAL(triggered()), this, SLOT(on_trigger())); + trigger_high_->setCheckable(true); + connect(trigger_high_, SIGNAL(triggered()), this, SLOT(on_trigger())); - _trigger_falling = new QAction(QIcon(":/icons/trigger-falling.svg"), + trigger_falling_ = new QAction(*get_icon(":/icons/trigger-falling.svg"), tr("Trigger on falling edge"), parent); - _trigger_falling->setCheckable(true); - connect(_trigger_falling, SIGNAL(triggered()), this, SLOT(on_trigger())); + trigger_falling_->setCheckable(true); + connect(trigger_falling_, SIGNAL(triggered()), this, SLOT(on_trigger())); - _trigger_low = new QAction(QIcon(":/icons/trigger-low.svg"), + trigger_low_ = new QAction(*get_icon(":/icons/trigger-low.svg"), tr("Trigger on low level"), parent); - _trigger_low->setCheckable(true); - connect(_trigger_low, SIGNAL(triggered()), this, SLOT(on_trigger())); + trigger_low_->setCheckable(true); + connect(trigger_low_, SIGNAL(triggered()), this, SLOT(on_trigger())); - _trigger_change = new QAction(QIcon(":/icons/trigger-change.svg"), + trigger_change_ = new QAction(*get_icon(":/icons/trigger-change.svg"), tr("Trigger on rising or falling edge"), parent); - _trigger_change->setCheckable(true); - connect(_trigger_change, SIGNAL(triggered()), this, SLOT(on_trigger())); + trigger_change_->setCheckable(true); + connect(trigger_change_, SIGNAL(triggered()), this, SLOT(on_trigger())); } -QAction* LogicSignal::match_action(const TriggerMatchType *type) +const vector LogicSignal::get_trigger_types() const +{ + const auto sr_dev = device_->device(); + const auto keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS); + const auto iter = keys.find(ConfigKey::TRIGGER_MATCH); + if (iter != keys.end() && + (*iter).second.find(sigrok::LIST) != (*iter).second.end()) { + try { + const Glib::VariantContainerBase gvar = + sr_dev->config_list(ConfigKey::TRIGGER_MATCH); + return Glib::VariantBase::cast_dynamic< + Glib::Variant>>(gvar).get(); + } catch (Error e) { + // Failed to enumerate triggers + (void)e; + } + } + + return vector(); +} + +QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type) { QAction *action; - action = _trigger_none; + action = trigger_none_; if (type) { switch (type->id()) { case SR_TRIGGER_ZERO: - action = _trigger_low; + action = trigger_low_; break; case SR_TRIGGER_ONE: - action = _trigger_high; + action = trigger_high_; break; case SR_TRIGGER_RISING: - action = _trigger_rising; + action = trigger_rising_; break; case SR_TRIGGER_FALLING: - action = _trigger_falling; + action = trigger_falling_; break; case SR_TRIGGER_EDGE: - action = _trigger_change; + action = trigger_change_; break; default: assert(0); @@ -293,17 +386,17 @@ QAction* LogicSignal::match_action(const TriggerMatchType *type) return action; } -const TriggerMatchType *LogicSignal::action_match(QAction *action) +const TriggerMatchType *LogicSignal::trigger_type_from_action(QAction *action) { - if (action == _trigger_low) + if (action == trigger_low_) return TriggerMatchType::ZERO; - else if (action == _trigger_high) + else if (action == trigger_high_) return TriggerMatchType::ONE; - else if (action == _trigger_rising) + else if (action == trigger_rising_) return TriggerMatchType::RISING; - else if (action == _trigger_falling) + else if (action == trigger_falling_) return TriggerMatchType::FALLING; - else if (action == _trigger_change) + else if (action == trigger_change_) return TriggerMatchType::EDGE; else return nullptr; @@ -311,71 +404,97 @@ const TriggerMatchType *LogicSignal::action_match(QAction *action) void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) { - Glib::VariantContainerBase gvar; - vector trig_types; - Signal::populate_popup_form(parent, form); - try { - gvar = _device->config_list(ConfigKey::TRIGGER_MATCH); - } catch (Error e) { - return; - } + const vector trig_types = get_trigger_types(); - _trigger_bar = new QToolBar(parent); - init_trigger_actions(_trigger_bar); - _trigger_bar->addAction(_trigger_none); - _trigger_none->setChecked(!_trigger_match); - trig_types = - Glib::VariantBase::cast_dynamic>>( - gvar).get(); - for (auto type_id : trig_types) { - auto type = TriggerMatchType::get(type_id); - _trigger_bar->addAction(match_action(type)); - match_action(type)->setChecked(_trigger_match == type); - } - form->addRow(tr("Trigger"), _trigger_bar); + if (!trig_types.empty()) { + trigger_bar_ = new QToolBar(parent); + init_trigger_actions(trigger_bar_); + trigger_bar_->addAction(trigger_none_); + trigger_none_->setChecked(!trigger_match_); + for (auto type_id : trig_types) { + const TriggerMatchType *const type = + TriggerMatchType::get(type_id); + QAction *const action = action_from_trigger_type(type); + trigger_bar_->addAction(action); + action->setChecked(trigger_match_ == type); + } + form->addRow(tr("Trigger"), trigger_bar_); + } } void LogicSignal::modify_trigger() { - auto trigger = _session.session()->trigger(); - auto new_trigger = _session.device_manager().context()->create_trigger("pulseview"); + auto trigger = session_.session()->trigger(); + auto new_trigger = session_.device_manager().context()->create_trigger("pulseview"); if (trigger) { for (auto stage : trigger->stages()) { const auto &matches = stage->matches(); - if (std::none_of(begin(matches), end(matches), + if (std::none_of(matches.begin(), matches.end(), [&](shared_ptr match) { - return match->channel() != _channel; })) + return match->channel() != channel_; })) continue; auto new_stage = new_trigger->add_stage(); for (auto match : stage->matches()) { - if (match->channel() == _channel) + if (match->channel() == channel_) continue; new_stage->add_match(match->channel(), match->type()); } } } - if (_trigger_match) - new_trigger->add_stage()->add_match(_channel, _trigger_match); + if (trigger_match_) { + // Until we can let the user decide how to group trigger matches + // into stages, put all of the matches into a single stage -- + // most devices only support a single trigger stage. + if (new_trigger->stages().empty()) + new_trigger->add_stage(); + + new_trigger->stages().back()->add_match(channel_, trigger_match_); + } - _session.session()->set_trigger( + session_.session()->set_trigger( new_trigger->stages().empty() ? nullptr : new_trigger); + + if (owner_) + owner_->row_item_appearance_changed(false, true); +} + +const QIcon* LogicSignal::get_icon(const char *path) +{ + const QIcon *icon = icon_cache_.take(path); + if (!icon) { + icon = new QIcon(path); + icon_cache_.insert(path, icon); + } + + return icon; +} + +const QPixmap* LogicSignal::get_pixmap(const char *path) +{ + const QPixmap *pixmap = pixmap_cache_.take(path); + if (!pixmap) { + pixmap = new QPixmap(path); + pixmap_cache_.insert(path, pixmap); + } + + return pixmap; } void LogicSignal::on_trigger() { QAction *action; - match_action(_trigger_match)->setChecked(false); + action_from_trigger_type(trigger_match_)->setChecked(false); action = (QAction *)sender(); action->setChecked(true); - _trigger_match = action_match(action); + trigger_match_ = trigger_type_from_action(action); modify_trigger(); }