X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=b684210b26667e3fcf7ee30e3447867d1708bb68;hp=568d10b383652a438ddb88c8be09b44a6ac81e27;hb=4145b248aed3dde5ccc02c9b7e389b5cb67c547d;hpb=3ef6182a4cb1d50262f019e5d78bd5c00fc08ca5

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 568d10b3..b684210b 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -39,7 +39,7 @@ const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
 const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00);
 const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00);
 
-const QColor LogicSignal::LogicSignalColours[10] = {
+const QColor LogicSignal::SignalColours[10] = {
 	QColor(0x16, 0x19, 0x1A),	// Black
 	QColor(0x8F, 0x52, 0x02),	// Brown
 	QColor(0xCC, 0x00, 0x00),	// Red
@@ -52,15 +52,53 @@ const QColor LogicSignal::LogicSignalColours[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 = LogicSignalColours[
-		_probe_index % countof(LogicSignalColours)];
+	_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,
@@ -72,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;
@@ -89,8 +131,13 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 
+	double samplerate = _data->get_samplerate();
+
+	// Show sample rate as 1Hz when it is unknown
+	if (samplerate == 0.0)
+		samplerate = 1.0;
+
 	const double pixels_offset = offset / scale;
-	const double samplerate = _data->get_samplerate();
 	const double start_time = _data->get_start_time();
 	const int64_t last_sample = snapshot->get_sample_count() - 1;
 	const double samples_per_pixel = samplerate * scale;
@@ -100,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