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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 568d10b3..bf8b3659 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -24,8 +24,11 @@
 
 #include "logicsignal.h"
 #include "view.h"
+
+#include "pv/sigsession.h"
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
+#include "pv/view/view.h"
 
 using namespace boost;
 using namespace std;
@@ -39,7 +42,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,19 +55,36 @@ 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(pv::SigSession &session, const sr_probe *const probe,
+	shared_ptr<data::Logic> data) :
+	Signal(session, probe),
+	_data(data),
+	_trigger_none(NULL),
+	_trigger_rising(NULL),
+	_trigger_high(NULL),
+	_trigger_falling(NULL),
+	_trigger_low(NULL),
+	_trigger_change(NULL)
+{
+	_colour = SignalColours[probe->index % countof(SignalColours)];
+}
+
+LogicSignal::~LogicSignal()
+{
+}
+
+boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+{
+	return _data;
+}
+
+void LogicSignal::paint_back(QPainter &p, int left, int right)
 {
-	assert(_probe_index >= 0);
-	_colour = LogicSignalColours[
-		_probe_index % countof(LogicSignalColours)];
+	if (_probe->enabled)
+		paint_axis(p, get_y(), left, right);
 }
 
-void LogicSignal::paint(QPainter &p, int y, int left, int right,
-		double scale, double offset)
+void LogicSignal::paint_mid(QPainter &p, int left, int right)
 {
 	using pv::view::View;
 
@@ -72,11 +92,20 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 
 	vector< pair<int64_t, bool> > edges;
 
-	assert(scale > 0);
+	assert(_probe);
 	assert(_data);
 	assert(right >= left);
 
-	paint_axis(p, y, left, right);
+	assert(_view);
+	const int y = _v_offset - _view->v_offset();
+	
+	const double scale = _view->scale();
+	assert(scale > 0);
+	
+	const double offset = _view->offset();
+
+	if (!_probe->enabled)
+		return;
 
 	const float high_offset = y - View::SignalHeight + 0.5f;
 	const float low_offset = y + 0.5f;
@@ -89,8 +118,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 +134,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
@@ -154,5 +188,67 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 	p.drawLines(lines, line - lines);
 }
 
+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