X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=bc0961f6a685afa15ffd7b1bd95732682d9fa0b9;hp=49d1263642b9b97ee3bac15c95fbe8a897e2f724;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=4c60462b00cc329e61daedd1c2e66724077bd412 diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 49d12636..bc0961f6 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -25,6 +25,7 @@ #include +#include #include #include @@ -36,6 +37,7 @@ #include #include #include +#include #include #include @@ -48,8 +50,8 @@ using std::pair; using std::shared_ptr; using std::vector; -using sigrok::Channel; using sigrok::ConfigKey; +using sigrok::Capability; using sigrok::Error; using sigrok::Trigger; using sigrok::TriggerStage; @@ -57,10 +59,8 @@ using sigrok::TriggerMatch; using sigrok::TriggerMatchType; namespace pv { -namespace view { - -const int LogicSignal::SignalHeight = 30; -const int LogicSignal::SignalMargin = 10; +namespace views { +namespace TraceView { const float LogicSignal::Oversampling = 2.0f; @@ -100,11 +100,10 @@ QCache LogicSignal::pixmap_cache_; LogicSignal::LogicSignal( pv::Session &session, shared_ptr device, - shared_ptr channel, - shared_ptr data) : - Signal(session, channel), + shared_ptr base) : + Signal(session, base), + signal_height_(QFontMetrics(QApplication::font()).height() * 2), device_(device), - data_(data), trigger_none_(nullptr), trigger_rising_(nullptr), trigger_high_(nullptr), @@ -114,7 +113,7 @@ LogicSignal::LogicSignal( { shared_ptr trigger; - colour_ = SignalColours[channel->index() % countof(SignalColours)]; + 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. */ @@ -122,38 +121,37 @@ LogicSignal::LogicSignal( if ((trigger = session_.session()->trigger())) for (auto stage : trigger->stages()) for (auto match : stage->matches()) - if (match->channel() == channel_) + if (match->channel() == base_->channel()) trigger_match_ = match->type(); } -LogicSignal::~LogicSignal() -{ -} - shared_ptr LogicSignal::data() const { - return data_; + return base_->logic_data(); } shared_ptr LogicSignal::logic_data() const { - return data_; + return base_->logic_data(); } -void LogicSignal::set_logic_data(std::shared_ptr data) +std::pair LogicSignal::v_extents() const { - data_ = data; + const int signal_margin = + QFontMetrics(QApplication::font()).height() / 2; + return make_pair(-signal_height_ - signal_margin, signal_margin); } -std::pair LogicSignal::v_extents() const +int LogicSignal::scale_handle_offset() const { - return make_pair(-SignalHeight - SignalMargin, SignalMargin); + return -signal_height_; } -void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp) +void LogicSignal::scale_handle_dragged(int offset) { - if (channel_->enabled()) - paint_axis(p, pp, get_visual_y()); + 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) @@ -162,20 +160,19 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) vector< pair > edges; - assert(channel_); - assert(data_); + assert(base_); assert(owner_); const int y = get_visual_y(); - if (!channel_->enabled()) + if (!base_->enabled()) return; - const float high_offset = y - SignalHeight + 0.5f; + const float high_offset = y - signal_height_ + 0.5f; const float low_offset = y + 0.5f; const deque< shared_ptr > &segments = - data_->logic_segments(); + base_->logic_data()->logic_segments(); if (segments.empty()) return; @@ -189,16 +186,19 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) samplerate = 1.0; const double pixels_offset = pp.pixels_offset(); - const double start_time = segment->start_time(); + 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 double start = samplerate * (pp.offset() - start_time); - const double end = start + samples_per_pixel * pp.width(); + const pv::util::Timestamp start = samplerate * (pp.offset() - start_time); + const pv::util::Timestamp end = start + samples_per_pixel * pp.width(); - segment->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 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 @@ -233,7 +233,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp) void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp) { // Draw the trigger marker - if (!trigger_match_) + if (!trigger_match_ || !base_->enabled()) return; const int y = get_visual_y(); @@ -255,7 +255,7 @@ void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp) const QSize size = pixmap->size(); const QPoint point( pp.right() - size.width() - pad * 2, - y - (SignalHeight + size.height()) / 2); + y - (signal_height_ + size.height()) / 2); p.setPen(QPen(TriggerMarkerBackgroundColour.darker())); p.setBrush(TriggerMarkerBackgroundColour); @@ -322,22 +322,26 @@ void LogicSignal::init_trigger_actions(QWidget *parent) 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; + 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 vector(); + return ttypes; + } else { + return vector(); + } } QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type) @@ -417,22 +421,30 @@ void LogicSignal::modify_trigger() 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() != base_->channel(); })) continue; auto new_stage = new_trigger->add_stage(); for (auto match : stage->matches()) { - if (match->channel() == channel_) + if (match->channel() == base_->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(base_->channel(), + trigger_match_); + } session_.session()->set_trigger( new_trigger->stages().empty() ? nullptr : new_trigger); @@ -443,24 +455,22 @@ void LogicSignal::modify_trigger() const QIcon* LogicSignal::get_icon(const char *path) { - const QIcon *icon = icon_cache_.take(path); - if (!icon) { - icon = new QIcon(path); + if (!icon_cache_.contains(path)) { + const QIcon *icon = new QIcon(path); icon_cache_.insert(path, icon); } - return icon; + return icon_cache_.take(path); } const QPixmap* LogicSignal::get_pixmap(const char *path) { - const QPixmap *pixmap = pixmap_cache_.take(path); - if (!pixmap) { - pixmap = new QPixmap(path); + if (!pixmap_cache_.contains(path)) { + const QPixmap *pixmap = new QPixmap(path); pixmap_cache_.insert(path, pixmap); } - return pixmap; + return pixmap_cache_.take(path); } void LogicSignal::on_trigger() @@ -476,5 +486,6 @@ void LogicSignal::on_trigger() modify_trigger(); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv