X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.cpp;h=c8713114fbf1a8bea4e785a0e49b83958578da16;hb=b698553cd745bf4f50f73f513798bba6209a5d13;hp=cca25df282b5328767ce42cd0ead3b4dadb1e302;hpb=c0f868521a211747f89ef217ae63404f373d952b;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index cca25df..c871311 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -24,6 +24,8 @@
 
 #include "logicsignal.h"
 #include "view.h"
+
+#include "pv/sigsession.h"
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
 
@@ -78,6 +80,30 @@ LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
 	_colour = SignalColours[probe->index % countof(SignalColours)];
 
 	_separator.setSeparator(true);
+
+	_trigger_none.setCheckable(true);
+	connect(&_trigger_none, SIGNAL(triggered()),
+		this, SLOT(on_trigger_none()));
+
+	_trigger_rising.setCheckable(true);
+	connect(&_trigger_rising, SIGNAL(triggered()),
+		this, SLOT(on_trigger_rising()));
+
+	_trigger_high.setCheckable(true);
+	connect(&_trigger_high, SIGNAL(triggered()),
+		this, SLOT(on_trigger_high()));
+
+	_trigger_falling.setCheckable(true);
+	connect(&_trigger_falling, SIGNAL(triggered()),
+		this, SLOT(on_trigger_falling()));
+
+	_trigger_low.setCheckable(true);
+	connect(&_trigger_low, SIGNAL(triggered()),
+		this, SLOT(on_trigger_low()));
+
+	_trigger_change.setCheckable(true);
+	connect(&_trigger_change, SIGNAL(triggered()),
+		this, SLOT(on_trigger_change()));
 }
 
 LogicSignal::~LogicSignal()
@@ -86,17 +112,39 @@ LogicSignal::~LogicSignal()
 
 const list<QAction*> LogicSignal::get_context_bar_actions()
 {
+	GVariant *gvar;
 	list<QAction*> actions;
+
 	actions.push_back(&_name_action);
 
-	actions.push_back(&_separator);
+	// Add the trigger actions
+	const sr_dev_inst *const sdi = _session.get_device();
+	if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
+		&gvar, sdi) == SR_OK) {
+		const char *const trig_types =
+			g_variant_get_string(gvar, NULL);
+
+		if (trig_types && trig_types[0] != '\0') {
+			actions.push_back(&_separator);
+
+			actions.push_back(&_trigger_none);
+
+			add_trigger_action(trig_types, 'r',
+				&_trigger_rising, actions);
+			add_trigger_action(trig_types, '1',
+				&_trigger_high, actions);
+			add_trigger_action(trig_types, 'f',
+				&_trigger_falling, actions);
+			add_trigger_action(trig_types, '0',
+				&_trigger_low, actions);
+			add_trigger_action(trig_types, 'c',
+				&_trigger_change, actions);
+		
+			update_trigger_actions();
+		}
 
-	actions.push_back(&_trigger_none);
-	actions.push_back(&_trigger_rising);
-	actions.push_back(&_trigger_high);
-	actions.push_back(&_trigger_falling);
-	actions.push_back(&_trigger_low);
-	actions.push_back(&_trigger_change);
+		g_variant_unref(gvar);
+	}
 
 	return actions;
 }
@@ -201,5 +249,77 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 	p.drawLines(lines, line - lines);
 }
 
+void LogicSignal::add_trigger_action(const char *trig_types, char type,
+	QAction *action, list<QAction*> &actions)
+{
+	while(*trig_types)
+		if(*trig_types++ == type) {
+			actions.push_back(action);
+			break;
+		}
+}
+
+void LogicSignal::update_trigger_actions()
+{
+	const char cur_trigger = _probe->trigger ?
+		_probe->trigger[0] : '\0';
+	_trigger_none.setChecked(cur_trigger == '\0');
+	_trigger_rising.setChecked(cur_trigger == 'r');
+	_trigger_high.setChecked(cur_trigger == '1');
+	_trigger_falling.setChecked(cur_trigger == 'f');
+	_trigger_low.setChecked(cur_trigger == '0');
+	_trigger_change.setChecked(cur_trigger == 'c');
+}
+
+void LogicSignal::set_trigger(char type)
+{
+	const char trigger_type_string[2] = {type, 0};
+	const char *const trigger_string =
+		(type != 0) ? trigger_type_string : NULL;
+
+	const sr_dev_inst *const sdi = _session.get_device();
+	const int probe_count = g_slist_length(sdi->probes);
+	assert(probe_count > 0);
+
+	assert(_probe && _probe->index < probe_count);
+
+	for (int i = 0; i < probe_count; i++) {
+		sr_dev_trigger_set(sdi, i, (i == _probe->index) ?
+			trigger_string : NULL);
+	}
+
+	update_trigger_actions();
+}
+
+void LogicSignal::on_trigger_none()
+{
+	set_trigger('\0');	
+}
+
+void LogicSignal::on_trigger_rising()
+{
+	set_trigger('r');	
+}
+
+void LogicSignal::on_trigger_high()
+{
+	set_trigger('1');	
+}
+
+void LogicSignal::on_trigger_falling()
+{
+	set_trigger('f');	
+}
+
+void LogicSignal::on_trigger_low()
+{
+	set_trigger('0');	
+}
+
+void LogicSignal::on_trigger_change()
+{
+	set_trigger('c');	
+}
+
 } // namespace view
 } // namespace pv