X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=37445d96072133e64fe3d90d1798e4840a7d2f9d;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hp=e214ec78426c505d621808fb38e9e5f34dc65462;hpb=b86aa8f4a22857a90bbfca6e7993b2deaf1157d4;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index e214ec7..37445d9 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -23,6 +23,8 @@
 #include <cassert>
 #include <cmath>
 
+#include <algorithm>
+
 #include <QFormLayout>
 #include <QToolBar>
 
@@ -30,6 +32,7 @@
 #include "view.h"
 
 #include <pv/sigsession.h>
+#include <pv/devicemanager.h>
 #include <pv/data/logic.h>
 #include <pv/data/logicsnapshot.h>
 #include <pv/view/view.h>
@@ -38,6 +41,7 @@
 
 using std::deque;
 using std::max;
+using std::make_pair;
 using std::min;
 using std::pair;
 using std::shared_ptr;
@@ -48,11 +52,16 @@ using sigrok::ConfigKey;
 using sigrok::Device;
 using sigrok::Error;
 using sigrok::Trigger;
+using sigrok::TriggerStage;
+using sigrok::TriggerMatch;
 using sigrok::TriggerMatchType;
 
 namespace pv {
 namespace view {
 
+const int LogicSignal::SignalHeight = 30;
+const int LogicSignal::SignalMargin = 10;
+
 const float LogicSignal::Oversampling = 2.0f;
 
 const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
@@ -94,7 +103,7 @@ LogicSignal::LogicSignal(
 	/* Populate this channel's trigger setting with whatever we
 	 * find in the current session trigger, if anything. */
 	_trigger_match = nullptr;
-	if ((trigger = SigSession::_sr_session->trigger()))
+	if ((trigger = _session.session()->trigger()))
 		for (auto stage : trigger->stages())
 			for (auto match : stage->matches())
 				if (match->channel() == _channel)
@@ -115,6 +124,11 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 	return _data;
 }
 
+std::pair<int, int> LogicSignal::v_extents() const
+{
+	return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+}
+
 void LogicSignal::paint_back(QPainter &p, int left, int right)
 {
 	if (_channel->enabled())
@@ -132,19 +146,22 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	assert(_channel);
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
 
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	const int y = get_y();
 
-	const double scale = _view->scale();
+	const View *const view = _owner->view();
+	assert(view);
+	
+	const double scale = view->scale();
 	assert(scale > 0);
 
-	const double offset = _view->offset();
+	const double offset = view->offset();
 
 	if (!_channel->enabled())
 		return;
 
-	const float high_offset = y - View::SignalHeight + 0.5f;
+	const float high_offset = y - SignalHeight + 0.5f;
 	const float low_offset = y + 0.5f;
 
 	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
@@ -260,24 +277,26 @@ QAction* LogicSignal::match_action(const TriggerMatchType *type)
 	QAction *action;
 
 	action = _trigger_none;
-	switch (type->id()) {
-	case SR_TRIGGER_ZERO:
-		action = _trigger_low;
-		break;
-	case SR_TRIGGER_ONE:
-		action = _trigger_high;
-		break;
-	case SR_TRIGGER_RISING:
-		action = _trigger_rising;
-		break;
-	case SR_TRIGGER_FALLING:
-		action = _trigger_falling;
-		break;
-	case SR_TRIGGER_EDGE:
-		action = _trigger_change;
-		break;
-	default:
-		assert(0);
+	if (type) {
+		switch (type->id()) {
+		case SR_TRIGGER_ZERO:
+			action = _trigger_low;
+			break;
+		case SR_TRIGGER_ONE:
+			action = _trigger_high;
+			break;
+		case SR_TRIGGER_RISING:
+			action = _trigger_rising;
+			break;
+		case SR_TRIGGER_FALLING:
+			action = _trigger_falling;
+			break;
+		case SR_TRIGGER_EDGE:
+			action = _trigger_change;
+			break;
+		default:
+			assert(0);
+		}
 	}
 
 	return action;
@@ -315,6 +334,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	_trigger_bar = new QToolBar(parent);
 	init_trigger_actions(_trigger_bar);
 	_trigger_bar->addAction(_trigger_none);
+	_trigger_none->setChecked(!_trigger_match);
 	trig_types =
 		Glib::VariantBase::cast_dynamic<Glib::Variant<vector<int32_t>>>(
 			gvar).get();
@@ -327,6 +347,35 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 }
 
+void LogicSignal::modify_trigger()
+{
+	auto trigger = _session.session()->trigger();
+	auto new_trigger = _session.device_manager().context()->create_trigger("pulseview");
+
+	if (trigger) {
+		for (auto stage : trigger->stages()) {
+			const auto &matches = stage->matches();
+			if (std::none_of(begin(matches), end(matches),
+			    [&](shared_ptr<TriggerMatch> match) {
+					return match->channel() != _channel; }))
+				continue;
+
+			auto new_stage = new_trigger->add_stage();
+			for (auto match : stage->matches()) {
+				if (match->channel() == _channel)
+					continue;
+				new_stage->add_match(match->channel(), match->type());
+			}
+		}
+	}
+
+	if (_trigger_match)
+		new_trigger->add_stage()->add_match(_channel, _trigger_match);
+
+	_session.session()->set_trigger(
+		new_trigger->stages().empty() ? nullptr : new_trigger);
+}
+
 void LogicSignal::on_trigger()
 {
 	QAction *action;
@@ -337,6 +386,7 @@ void LogicSignal::on_trigger()
 	action->setChecked(true);
 	_trigger_match = action_match(action);
 
+	modify_trigger();
 }
 
 } // namespace view