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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index c23f0922..5584a1fc 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -51,6 +51,7 @@ using std::vector;
 
 using sigrok::Channel;
 using sigrok::ConfigKey;
+using sigrok::Capability;
 using sigrok::Error;
 using sigrok::Trigger;
 using sigrok::TriggerStage;
@@ -113,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. */
@@ -125,10 +126,6 @@ LogicSignal::LogicSignal(
 					trigger_match_ = match->type();
 }
 
-LogicSignal::~LogicSignal()
-{
-}
-
 shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
 	return data_;
@@ -163,12 +160,6 @@ void LogicSignal::scale_handle_dragged(int offset)
 	signal_height_ = ((units < 1) ? 1 : units) * font_height;
 }
 
-void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
-{
-	if (channel_->enabled())
-		paint_axis(p, pp, get_visual_y());
-}
-
 void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
 	QLineF *line;
@@ -249,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();
@@ -338,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)