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_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_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_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_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_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()));
}
-QAction* LogicSignal::match_action(const TriggerMatchType *type)
+const vector<int32_t> LogicSignal::get_trigger_types() const
+{
+ 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) {
+ return vector<int32_t>();
+ }
+}
+
+QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
{
QAction *action;
return action;
}
-const TriggerMatchType *LogicSignal::action_match(QAction *action)
+const TriggerMatchType *LogicSignal::trigger_type_from_action(QAction *action)
{
if (action == trigger_low_)
return TriggerMatchType::ZERO;
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;
- }
-
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();
+
+ const vector<int32_t> trig_types = get_trigger_types();
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);
+ 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_);
new_trigger->stages().empty() ? nullptr : new_trigger);
}
+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;
+}
+
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();
}