X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=c58b85d9857a2a622c6e7cf51b3674be7b77a48a;hb=77817b43ee7cf9f65d1d1fb8e71495347bd925fd;hp=e33c197a7be7ce31696c0465b82dd9cd4794f5c3;hpb=388cdd24f49e31203a01e38bf5ae97e7272f6396;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index e33c197..c58b85d 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -272,7 +272,19 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 	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;
 
@@ -302,7 +314,7 @@ QAction* LogicSignal::match_action(const TriggerMatchType *type)
 	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;
@@ -320,28 +332,18 @@ const TriggerMatchType *LogicSignal::action_match(QAction *action)
 
 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) {
 		const TriggerMatchType *const type =
 			TriggerMatchType::get(type_id);
-		QAction *const action = match_action(type);
+		QAction *const action = action_from_trigger_type(type);
 		trigger_bar_->addAction(action);
 		action->setChecked(trigger_match_ == type);
 	}
@@ -382,11 +384,11 @@ 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();
 }