#include <QFormLayout>
#include <QToolBar>
-#include "logicsignal.h"
-#include "view.h"
+#include "logicsignal.hpp"
+#include "view.hpp"
-#include <pv/sigsession.h>
-#include <pv/devicemanager.h>
-#include <pv/data/logic.h>
-#include <pv/data/logicsnapshot.h>
-#include <pv/view/view.h>
+#include <pv/session.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/data/logic.hpp>
+#include <pv/data/logicsegment.hpp>
+#include <pv/view/view.hpp>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
using std::deque;
using std::max;
+using std::make_pair;
using std::min;
using std::pair;
using std::shared_ptr;
namespace pv {
namespace view {
+const int LogicSignal::SignalHeight = 30;
+const int LogicSignal::SignalMargin = 10;
+
const float LogicSignal::Oversampling = 2.0f;
const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
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<QString, const QIcon> LogicSignal::icon_cache_;
+QCache<QString, const QPixmap> LogicSignal::pixmap_cache_;
+
LogicSignal::LogicSignal(
- pv::SigSession &session,
+ pv::Session &session,
shared_ptr<Device> device,
shared_ptr<Channel> channel,
shared_ptr<data::Logic> 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)
+ device_(device),
+ data_(data),
+ trigger_none_(NULL),
+ trigger_rising_(NULL),
+ trigger_high_(NULL),
+ trigger_falling_(NULL),
+ trigger_low_(NULL),
+ trigger_change_(NULL)
{
shared_ptr<Trigger> 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()
shared_ptr<pv::data::SignalData> LogicSignal::data() const
{
- return _data;
+ return data_;
}
shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
- return _data;
+ return data_;
+}
+
+void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
+{
+ data_ = data;
}
-void LogicSignal::paint_back(QPainter &p, int left, int right)
+std::pair<int, int> LogicSignal::v_extents() const
{
- if (_channel->enabled())
- paint_axis(p, get_y(), left, right);
+ return make_pair(-SignalHeight - SignalMargin, SignalMargin);
}
-void LogicSignal::paint_mid(QPainter &p, int left, int right)
+void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- using pv::view::View;
+ if (channel_->enabled())
+ paint_axis(p, pp, get_visual_y());
+}
+void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
+{
QLineF *line;
vector< pair<int64_t, bool> > edges;
- assert(_channel);
- assert(_data);
- assert(right >= left);
- assert(_owner);
-
- const int y = get_y();
+ assert(channel_);
+ assert(data_);
+ assert(owner_);
- const View *const view = _owner->view();
- assert(view);
-
- const double scale = view->scale();
- assert(scale > 0);
+ const int y = get_visual_y();
- const double offset = view->offset();
-
- if (!_channel->enabled())
+ if (!channel_->enabled())
return;
- const float high_offset = y - View::SignalHeight + 0.5f;
+ const float high_offset = y - SignalHeight + 0.5f;
const float low_offset = y + 0.5f;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
- _data->get_snapshots();
- if (snapshots.empty())
+ const deque< shared_ptr<pv::data::LogicSegment> > &segments =
+ data_->logic_segments();
+ if (segments.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
- snapshots.front();
+ const shared_ptr<pv::data::LogicSegment> &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);
+ const double pixels_offset = pp.pixels_offset();
+ const double 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();
- snapshot->get_subsampled_edges(edges,
+ 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());
+ samples_per_pixel / Oversampling, channel_->index());
assert(edges.size() >= 2);
// Paint the edges
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);
}
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_)
+ return;
+
+ const int y = get_visual_y();
+ const vector<int32_t> 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 - (SignalHeight + 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<int64_t, bool> > &edges, bool level,
double samples_per_pixel, double pixels_offset, float x_offset,
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()));
+}
+
+const vector<int32_t> LogicSignal::get_trigger_types() const
+{
+ const auto keys = device_->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 =
+ device_->config_list(ConfigKey::TRIGGER_MATCH);
+ return Glib::VariantBase::cast_dynamic<
+ Glib::Variant<vector<int32_t>>>(gvar).get();
+ } catch (Error e) {
+ // Failed to enumerate triggers
+ (void)e;
+ }
+ }
+
+ return vector<int32_t>();
}
-QAction* LogicSignal::match_action(const TriggerMatchType *type)
+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);
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;
void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
{
- Glib::VariantContainerBase gvar;
- vector<int32_t> trig_types;
-
Signal::populate_popup_form(parent, form);
- try {
- gvar = _device->config_list(ConfigKey::TRIGGER_MATCH);
- } catch (Error e) {
- return;
- }
+ const vector<int32_t> 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<Glib::Variant<vector<int32_t>>>(
- 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),
[&](shared_ptr<TriggerMatch> 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_)
+ new_trigger->add_stage()->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();
}
projects / pulseview.git / blobdiff