X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=5584a1fcb70a0fb334e85b2d2165a6b965efabfe;hp=573d1b780645dd4304295f1543f66f0fb76f4835;hb=03cc651d78a85308107e0ef3e5e514503d7c723c;hpb=214470fc17e73bbf4664f4c1678a7dd30c905bf2

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 573d1b78..5584a1fc 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 
+#include <QApplication>
 #include <QFormLayout>
 #include <QToolBar>
 
@@ -50,6 +51,7 @@ using std::vector;
 
 using sigrok::Channel;
 using sigrok::ConfigKey;
+using sigrok::Capability;
 using sigrok::Error;
 using sigrok::Trigger;
 using sigrok::TriggerStage;
@@ -59,9 +61,6 @@ 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);
@@ -103,6 +102,7 @@ LogicSignal::LogicSignal(
 	shared_ptr<Channel> channel,
 	shared_ptr<data::Logic> data) :
 	Signal(session, channel),
+	signal_height_(QFontMetrics(QApplication::font()).height() * 2),
 	device_(device),
 	data_(data),
 	trigger_none_(nullptr),
@@ -114,7 +114,7 @@ LogicSignal::LogicSignal(
 {
 	shared_ptr<Trigger> trigger;
 
-	colour_ = SignalColours[channel->index() % countof(SignalColours)];
+	set_colour(SignalColours[channel->index() % countof(SignalColours)]);
 
 	/* Populate this channel's trigger setting with whatever we
 	 * find in the current session trigger, if anything. */
@@ -126,10 +126,6 @@ LogicSignal::LogicSignal(
 					trigger_match_ = match->type();
 }
 
-LogicSignal::~LogicSignal()
-{
-}
-
 shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
 	return data_;
@@ -147,23 +143,21 @@ void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
 
 std::pair<int, int> LogicSignal::v_extents() const
 {
-	return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+	const int signal_margin =
+		QFontMetrics(QApplication::font()).height() / 2;
+	return make_pair(-signal_height_ - signal_margin, signal_margin);
 }
 
 int LogicSignal::scale_handle_offset() const
 {
-	return SignalHeight;
+	return -signal_height_;
 }
 
 void LogicSignal::scale_handle_dragged(int offset)
 {
-	(void)offset;
-}
-
-void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
-{
-	if (channel_->enabled())
-		paint_axis(p, pp, get_visual_y());
+	const int font_height = QFontMetrics(QApplication::font()).height();
+	const int units = (-offset / font_height);
+	signal_height_ = ((units < 1) ? 1 : units) * font_height;
 }
 
 void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
@@ -181,7 +175,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 	if (!channel_->enabled())
 		return;
 
-	const float high_offset = y - SignalHeight + 0.5f;
+	const float high_offset = y - signal_height_ + 0.5f;
 	const float low_offset = y + 0.5f;
 
 	const deque< shared_ptr<pv::data::LogicSegment> > &segments =
@@ -246,7 +240,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 {
 	// Draw the trigger marker
-	if (!trigger_match_)
+	if (!trigger_match_ || !channel_->enabled())
 		return;
 
 	const int y = get_visual_y();
@@ -268,7 +262,7 @@ void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 		const QSize size = pixmap->size();
 		const QPoint point(
 			pp.right() - size.width() - pad * 2,
-			y - (SignalHeight + size.height()) / 2);
+			y - (signal_height_ + size.height()) / 2);
 
 		p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
 		p.setBrush(TriggerMarkerBackgroundColour);
@@ -335,22 +329,14 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
 	const auto sr_dev = device_->device();
-	const auto keys = sr_dev->config_keys(ConfigKey::DEVICE_OPTIONS);
-	const auto iter = keys.find(ConfigKey::TRIGGER_MATCH);
-	if (iter != keys.end() &&
-		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-		try {
-			const Glib::VariantContainerBase gvar =
-				sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
-			return Glib::VariantBase::cast_dynamic<
-				Glib::Variant<vector<int32_t>>>(gvar).get();
-		} catch (Error e) {
-			// Failed to enumerate triggers
-			(void)e;
-		}
+	if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
+		const Glib::VariantContainerBase gvar =
+			sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
+		return Glib::VariantBase::cast_dynamic<
+			Glib::Variant<vector<int32_t>>>(gvar).get();
+	} else {
+		return vector<int32_t>();
 	}
-
-	return vector<int32_t>();
 }
 
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
@@ -444,8 +430,15 @@ void LogicSignal::modify_trigger()
 		}
 	}
 
-	if (trigger_match_)
-		new_trigger->add_stage()->add_match(channel_, trigger_match_);
+	if (trigger_match_) {
+		// Until we can let the user decide how to group trigger matches
+		// into stages, put all of the matches into a single stage --
+		// most devices only support a single trigger stage.
+		if (new_trigger->stages().empty())
+			new_trigger->add_stage();
+
+		new_trigger->stages().back()->add_match(channel_, trigger_match_);
+	}
 
 	session_.session()->set_trigger(
 		new_trigger->stages().empty() ? nullptr : new_trigger);