X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=b684210b26667e3fcf7ee30e3447867d1708bb68;hb=4145b248aed3dde5ccc02c9b7e389b5cb67c547d;hp=21c9abbc8f8af78580ebe111c8654db865bb0273;hpb=f459c5400e067c4389c472b84194d760e7bfd585;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 21c9abb..b684210 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -52,20 +52,55 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(QString name, shared_ptr<data::Logic> data,
-	int probe_index) :
-	Signal(name),
-	_probe_index(probe_index),
-	_data(data)
+LogicSignal::LogicSignal(const sr_probe *const probe,
+	shared_ptr<data::Logic> data) :
+	Signal(probe),
+	_data(data),
+	_separator(this),
+	_icon_trigger_none(":/icons/trigger-none.svg"),
+	_trigger_none(_icon_trigger_none, tr("No trigger"), this),
+	_icon_trigger_rising(":/icons/trigger-rising.svg"),
+	_trigger_rising(_icon_trigger_rising,
+		tr("Trigger on rising edge"), this),
+	_icon_trigger_high(":/icons/trigger-high.svg"),
+	_trigger_high(_icon_trigger_high,
+		tr("Trigger on high level"), this),
+	_icon_trigger_falling(":/icons/trigger-falling.svg"),
+	_trigger_falling(_icon_trigger_falling,
+		tr("Trigger on falling edge"), this),
+	_icon_trigger_low(":/icons/trigger-low.svg"),
+	_trigger_low(_icon_trigger_low,
+		tr("Trigger on low level"), this),
+	_icon_trigger_change(":/icons/trigger-change.svg"),
+	_trigger_change(_icon_trigger_change,
+		tr("Trigger on rising or falling edge"), this)
 {
-	assert(_probe_index >= 0);
-	_colour = SignalColours[_probe_index % countof(SignalColours)];
+	_colour = SignalColours[probe->index % countof(SignalColours)];
+
+	_separator.setSeparator(true);
 }
 
 LogicSignal::~LogicSignal()
 {
 }
 
+const list<QAction*> LogicSignal::get_context_bar_actions()
+{
+	list<QAction*> actions;
+	actions.push_back(&_name_action);
+
+	actions.push_back(&_separator);
+
+	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);
+
+	return actions;
+}
+
 void LogicSignal::paint(QPainter &p, int y, int left, int right,
 		double scale, double offset)
 {
@@ -75,10 +110,14 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 
 	vector< pair<int64_t, bool> > edges;
 
+	assert(_probe);
 	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
 
+	if (!_probe->enabled)
+		return;
+
 	paint_axis(p, y, left, right);
 
 	const float high_offset = y - View::SignalHeight + 0.5f;
@@ -108,7 +147,7 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 	snapshot->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, _probe_index);
+		samples_per_pixel / Oversampling, _probe->index);
 	assert(edges.size() >= 2);
 
 	// Paint the edges