using sigrok::Channel;
using sigrok::ConfigKey;
+using sigrok::Capability;
using sigrok::Error;
using sigrok::Trigger;
using sigrok::TriggerStage;
{
shared_ptr<Trigger> trigger;
- colour_ = SignalColours[channel->index() % countof(SignalColours)];
+ set_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_ = match->type();
}
-LogicSignal::~LogicSignal()
-{
-}
-
shared_ptr<pv::data::SignalData> LogicSignal::data() const
{
return data_;
signal_height_ = ((units < 1) ? 1 : units) * font_height;
}
-void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
-{
- if (channel_->enabled())
- paint_axis(p, pp, get_visual_y());
-}
-
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
{
QLineF *line;
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
// Draw the trigger marker
- if (!trigger_match_)
+ if (!trigger_match_ || !channel_->enabled())
return;
const int y = get_visual_y();
const vector<int32_t> 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<vector<int32_t>>>(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<int32_t> ttypes;
+
+ for (unsigned int i = 0; i < gvar.get_n_children(); i++) {
+ Glib::VariantBase tmp_vb;
+ gvar.get_child(tmp_vb, i);
+
+ Glib::Variant<int32_t> tmp_v =
+ Glib::VariantBase::cast_dynamic< Glib::Variant<int32_t> >(tmp_vb);
+
+ ttypes.push_back(tmp_v.get());
}
- }
- return vector<int32_t>();
+ return ttypes;
+ } else {
+ return vector<int32_t>();
+ }
}
QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
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()