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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index bf8b3659..89c375cc 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -22,16 +22,24 @@
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #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"
+#include <pv/sigsession.h>
+#include <pv/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -55,9 +63,9 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
-	shared_ptr<data::Logic> data) :
-	Signal(session, probe),
+LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,
+	const sr_probe *const probe, shared_ptr<data::Logic> data) :
+	Signal(dev_inst, probe),
 	_data(data),
 	_trigger_none(NULL),
 	_trigger_rising(NULL),
@@ -73,7 +81,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+	return _data;
+}
+
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
 	return _data;
 }
@@ -118,7 +131,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 
-	double samplerate = _data->get_samplerate();
+	double samplerate = _data->samplerate();
 
 	// Show sample rate as 1Hz when it is unknown
 	if (samplerate == 0.0)
@@ -155,7 +168,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	delete[] edge_lines;
 
 	// Paint the caps
-	const unsigned int max_cap_line_count = (edges.size() - 1);
+	const unsigned int max_cap_line_count = edges.size();
 	QLineF *const cap_lines = new QLineF[max_cap_line_count];
 
 	p.setPen(HighColour);
@@ -188,6 +201,89 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 	p.drawLines(lines, line - lines);
 }
 
+void LogicSignal::init_trigger_actions(QWidget *parent)
+{
+	_trigger_none = new QAction(QIcon(":/icons/trigger-none.svg"),
+		tr("No trigger"), parent);
+	_trigger_none->setCheckable(true);
+	connect(_trigger_none, SIGNAL(triggered()),
+		this, SLOT(on_trigger_none()));
+
+	_trigger_rising = new QAction(QIcon(":/icons/trigger-rising.svg"),
+		tr("Trigger on rising edge"), parent);
+	_trigger_rising->setCheckable(true);
+	connect(_trigger_rising, SIGNAL(triggered()),
+		this, SLOT(on_trigger_rising()));
+
+	_trigger_high = new QAction(QIcon(":/icons/trigger-high.svg"),
+		tr("Trigger on high level"), parent);
+	_trigger_high->setCheckable(true);
+	connect(_trigger_high, SIGNAL(triggered()),
+		this, SLOT(on_trigger_high()));
+
+	_trigger_falling = new QAction(QIcon(":/icons/trigger-falling.svg"),
+		tr("Trigger on falling edge"), parent);
+	_trigger_falling->setCheckable(true);
+	connect(_trigger_falling, SIGNAL(triggered()),
+		this, SLOT(on_trigger_falling()));
+
+	_trigger_low = new QAction(QIcon(":/icons/trigger-low.svg"),
+		tr("Trigger on low level"), parent);
+	_trigger_low->setCheckable(true);
+	connect(_trigger_low, SIGNAL(triggered()),
+		this, SLOT(on_trigger_low()));
+
+	_trigger_change = new QAction(QIcon(":/icons/trigger-change.svg"),
+		tr("Trigger on rising or falling edge"), parent);
+	_trigger_change->setCheckable(true);
+	connect(_trigger_change, SIGNAL(triggered()),
+		this, SLOT(on_trigger_change()));
+}
+
+void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	GVariant *gvar;
+
+	Signal::populate_popup_form(parent, form);
+
+	// Add the trigger actions
+	assert(_dev_inst);
+	if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+	{
+		const char *const trig_types =
+			g_variant_get_string(gvar, NULL);
+
+		if (trig_types && trig_types[0] != '\0')
+		{
+			_trigger_bar = new QToolBar(parent);
+
+			init_trigger_actions(_trigger_bar);
+			_trigger_bar->addAction(_trigger_none);
+			add_trigger_action(trig_types, 'r', _trigger_rising);
+			add_trigger_action(trig_types, '1', _trigger_high);
+			add_trigger_action(trig_types, 'f', _trigger_falling);
+			add_trigger_action(trig_types, '0', _trigger_low);
+			add_trigger_action(trig_types, 'c', _trigger_change);
+		
+			update_trigger_actions();
+
+			form->addRow(tr("Trigger"), _trigger_bar);
+		}
+
+		g_variant_unref(gvar);
+	}
+}
+
+void LogicSignal::add_trigger_action(const char *trig_types, char type,
+	QAction *action)
+{
+	while(*trig_types)
+		if(*trig_types++ == type) {
+			_trigger_bar->addAction(action);
+			break;
+		}
+}
+
 void LogicSignal::update_trigger_actions()
 {
 	const char cur_trigger = _probe->trigger ?
@@ -206,7 +302,10 @@ void LogicSignal::set_trigger(char type)
 	const char *const trigger_string =
 		(type != 0) ? trigger_type_string : NULL;
 
-	const sr_dev_inst *const sdi = _session.get_device();
+	assert(_dev_inst);
+	const sr_dev_inst *const sdi = _dev_inst->dev_inst();
+	assert(sdi);
+
 	const int probe_count = g_slist_length(sdi->probes);
 	assert(probe_count > 0);