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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index ea138fa7..bf8b3659 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -28,6 +28,7 @@
 #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;
@@ -58,86 +59,32 @@ LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
 	shared_ptr<data::Logic> data) :
 	Signal(session, 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)
+	_trigger_none(NULL),
+	_trigger_rising(NULL),
+	_trigger_high(NULL),
+	_trigger_falling(NULL),
+	_trigger_low(NULL),
+	_trigger_change(NULL)
 {
 	_colour = SignalColours[probe->index % countof(SignalColours)];
-
-	_separator.setSeparator(true);
-
-	connect(&_trigger_none, SIGNAL(triggered()),
-		this, SLOT(on_trigger_none()));
-	connect(&_trigger_rising, SIGNAL(triggered()),
-		this, SLOT(on_trigger_rising()));
-	connect(&_trigger_high, SIGNAL(triggered()),
-		this, SLOT(on_trigger_high()));
-	connect(&_trigger_falling, SIGNAL(triggered()),
-		this, SLOT(on_trigger_falling()));
-	connect(&_trigger_low, SIGNAL(triggered()),
-		this, SLOT(on_trigger_low()));
-	connect(&_trigger_change, SIGNAL(triggered()),
-		this, SLOT(on_trigger_change()));
 }
 
 LogicSignal::~LogicSignal()
 {
 }
 
-const list<QAction*> LogicSignal::get_context_bar_actions()
+boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
 {
-	GVariant *gvar;
-	list<QAction*> actions;
-
-	actions.push_back(&_name_action);
-
-	// 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);
-		}
-
-		g_variant_unref(gvar);
-	}
+	return _data;
+}
 
-	return actions;
+void LogicSignal::paint_back(QPainter &p, int left, int right)
+{
+	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;
 
@@ -146,15 +93,20 @@ 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);
 
+	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;
 
-	paint_axis(p, y, left, right);
-
 	const float high_offset = y - View::SignalHeight + 0.5f;
 	const float low_offset = y + 0.5f;
 
@@ -236,14 +188,16 @@ 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)
+void LogicSignal::update_trigger_actions()
 {
-	while(*trig_types)
-		if(*trig_types++ == type) {
-			actions.push_back(action);
-			break;
-		}
+	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)
@@ -262,6 +216,8 @@ void LogicSignal::set_trigger(char type)
 		sr_dev_trigger_set(sdi, i, (i == _probe->index) ?
 			trigger_string : NULL);
 	}
+
+	update_trigger_actions();
 }
 
 void LogicSignal::on_trigger_none()