X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=bc0961f6a685afa15ffd7b1bd95732682d9fa0b9;hp=b684210b26667e3fcf7ee30e3447867d1708bb68;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=4145b248aed3dde5ccc02c9b7e389b5cb67c547d diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index b684210b..bc0961f6 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -20,18 +20,47 @@ #include -#include - -#include "logicsignal.h" -#include "view.h" -#include "pv/data/logic.h" -#include "pv/data/logicsnapshot.h" - -using namespace boost; -using namespace std; +#include +#include + +#include + +#include +#include +#include + +#include "logicsignal.hpp" +#include "view.hpp" + +#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; +using std::vector; + +using sigrok::ConfigKey; +using sigrok::Capability; +using sigrok::Error; +using sigrok::Trigger; +using sigrok::TriggerStage; +using sigrok::TriggerMatch; +using sigrok::TriggerMatchType; namespace pv { -namespace view { +namespace views { +namespace TraceView { const float LogicSignal::Oversampling = 2.0f; @@ -52,102 +81,124 @@ const QColor LogicSignal::SignalColours[10] = { QColor(0xEE, 0xEE, 0xEC), // White }; -LogicSignal::LogicSignal(const sr_probe *const probe, - shared_ptr data) : - Signal(probe), - _data(data), - _separator(this), - _icon_trigger_none(":/icons/trigger-none.svg"), - _trigger_none(_icon_trigger_none, tr("No trigger"), this), - _icon_trigger_rising(":/icons/trigger-rising.svg"), - _trigger_rising(_icon_trigger_rising, - tr("Trigger on rising edge"), this), - _icon_trigger_high(":/icons/trigger-high.svg"), - _trigger_high(_icon_trigger_high, - tr("Trigger on high level"), this), - _icon_trigger_falling(":/icons/trigger-falling.svg"), - _trigger_falling(_icon_trigger_falling, - tr("Trigger on falling edge"), this), - _icon_trigger_low(":/icons/trigger-low.svg"), - _trigger_low(_icon_trigger_low, - tr("Trigger on low level"), this), - _icon_trigger_change(":/icons/trigger-change.svg"), - _trigger_change(_icon_trigger_change, - tr("Trigger on rising or falling edge"), this) -{ - _colour = SignalColours[probe->index % countof(SignalColours)]; +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 +}; - _separator.setSeparator(true); +QCache LogicSignal::icon_cache_; +QCache LogicSignal::pixmap_cache_; + +LogicSignal::LogicSignal( + pv::Session &session, + shared_ptr device, + shared_ptr base) : + Signal(session, base), + signal_height_(QFontMetrics(QApplication::font()).height() * 2), + device_(device), + trigger_none_(nullptr), + trigger_rising_(nullptr), + trigger_high_(nullptr), + trigger_falling_(nullptr), + trigger_low_(nullptr), + trigger_change_(nullptr) +{ + shared_ptr trigger; + + base_->set_colour(SignalColours[base->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())) + for (auto stage : trigger->stages()) + for (auto match : stage->matches()) + if (match->channel() == base_->channel()) + trigger_match_ = match->type(); } -LogicSignal::~LogicSignal() +shared_ptr LogicSignal::data() const { + return base_->logic_data(); } -const list LogicSignal::get_context_bar_actions() +shared_ptr LogicSignal::logic_data() const { - list actions; - actions.push_back(&_name_action); - - actions.push_back(&_separator); + return base_->logic_data(); +} - actions.push_back(&_trigger_none); - actions.push_back(&_trigger_rising); - actions.push_back(&_trigger_high); - actions.push_back(&_trigger_falling); - actions.push_back(&_trigger_low); - actions.push_back(&_trigger_change); +std::pair LogicSignal::v_extents() const +{ + const int signal_margin = + QFontMetrics(QApplication::font()).height() / 2; + return make_pair(-signal_height_ - signal_margin, signal_margin); +} - return actions; +int LogicSignal::scale_handle_offset() const +{ + return -signal_height_; } -void LogicSignal::paint(QPainter &p, int y, int left, int right, - double scale, double offset) +void LogicSignal::scale_handle_dragged(int offset) { - using pv::view::View; + const int font_height = QFontMetrics(QApplication::font()).height(); + const int units = (-offset / font_height); + signal_height_ = ((units < 1) ? 1 : units) * font_height; +} +void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) +{ QLineF *line; vector< pair > edges; - assert(_probe); - assert(scale > 0); - assert(_data); - assert(right >= left); + assert(base_); + assert(owner_); - if (!_probe->enabled) - return; + const int y = get_visual_y(); - paint_axis(p, y, left, right); + if (!base_->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 = + base_->logic_data()->logic_segments(); + if (segments.empty()) return; - const shared_ptr &snapshot = - snapshots.front(); + const shared_ptr &segment = + segments.front(); - double samplerate = _data->get_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, _probe->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, base_->index()); assert(edges.size() >= 2); // Paint the edges @@ -155,11 +206,9 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right, QLineF *const edge_lines = new QLineF[edge_count]; line = edge_lines; - for (vector::const_iterator i = - edges.begin() + 1; - i != edges.end() - 1; i++) { + 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); } @@ -168,19 +217,56 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right, delete[] edge_lines; // Paint the caps - const unsigned int max_cap_line_count = (edges.size() - 1); + const unsigned int max_cap_line_count = edges.size(); QLineF *const cap_lines = new QLineF[max_cap_line_count]; 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_ || !base_->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, @@ -188,8 +274,7 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, { QLineF *line = lines; - for (vector::const_iterator i = - edges.begin(); i != (edges.end() - 1); i++) + for (auto i = edges.begin(); i != (edges.end() - 1); i++) if ((*i).second == level) { *line++ = QLineF( ((*i).first / samples_per_pixel - @@ -201,5 +286,206 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines, p.drawLines(lines, line - lines); } -} // namespace view +void LogicSignal::init_trigger_actions(QWidget *parent) +{ + 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_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_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_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_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_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())); +} + +const vector LogicSignal::get_trigger_types() const +{ + const auto sr_dev = device_->device(); + if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) { + const Glib::VariantContainerBase gvar = + sr_dev->config_list(ConfigKey::TRIGGER_MATCH); + + vector ttypes; + + for (unsigned int i = 0; i < gvar.get_n_children(); i++) { + Glib::VariantBase tmp_vb; + gvar.get_child(tmp_vb, i); + + Glib::Variant tmp_v = + Glib::VariantBase::cast_dynamic< Glib::Variant >(tmp_vb); + + ttypes.push_back(tmp_v.get()); + } + + return ttypes; + } else { + return vector(); + } +} + +QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type) +{ + QAction *action; + + action = trigger_none_; + if (type) { + switch (type->id()) { + case SR_TRIGGER_ZERO: + action = trigger_low_; + break; + case SR_TRIGGER_ONE: + action = trigger_high_; + break; + case SR_TRIGGER_RISING: + action = trigger_rising_; + break; + case SR_TRIGGER_FALLING: + action = trigger_falling_; + break; + case SR_TRIGGER_EDGE: + action = trigger_change_; + break; + default: + assert(0); + } + } + + return action; +} + +const TriggerMatchType *LogicSignal::trigger_type_from_action(QAction *action) +{ + if (action == trigger_low_) + return TriggerMatchType::ZERO; + else if (action == trigger_high_) + return TriggerMatchType::ONE; + else if (action == trigger_rising_) + return TriggerMatchType::RISING; + else if (action == trigger_falling_) + return TriggerMatchType::FALLING; + else if (action == trigger_change_) + return TriggerMatchType::EDGE; + else + return nullptr; +} + +void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form) +{ + Signal::populate_popup_form(parent, form); + + const vector trig_types = get_trigger_types(); + + 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"); + + if (trigger) { + for (auto stage : trigger->stages()) { + const auto &matches = stage->matches(); + if (std::none_of(matches.begin(), matches.end(), + [&](shared_ptr match) { + return match->channel() != base_->channel(); })) + continue; + + auto new_stage = new_trigger->add_stage(); + for (auto match : stage->matches()) { + if (match->channel() == base_->channel()) + continue; + new_stage->add_match(match->channel(), match->type()); + } + } + } + + 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(base_->channel(), + trigger_match_); + } + + 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) +{ + if (!icon_cache_.contains(path)) { + const QIcon *icon = new QIcon(path); + icon_cache_.insert(path, icon); + } + + return icon_cache_.take(path); +} + +const QPixmap* LogicSignal::get_pixmap(const char *path) +{ + if (!pixmap_cache_.contains(path)) { + const QPixmap *pixmap = new QPixmap(path); + pixmap_cache_.insert(path, pixmap); + } + + return pixmap_cache_.take(path); +} + +void LogicSignal::on_trigger() +{ + QAction *action; + + action_from_trigger_type(trigger_match_)->setChecked(false); + + action = (QAction *)sender(); + action->setChecked(true); + trigger_match_ = trigger_type_from_action(action); + + modify_trigger(); +} + +} // namespace TraceView +} // namespace views } // namespace pv