X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=0d31696100545ae99e80c4fd0f64bc749bc67b48;hp=48d2debcf2a9df1ccd204d71b6ad486bc335d585;hb=8e097c274b5258b7f46d2dc534cadcb3bb1f059b;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 48d2debc..0d316961 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -37,7 +37,7 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/view/view.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::deque;
 using std::max;
@@ -140,18 +140,23 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 	return data_;
 }
 
+void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
+{
+	data_ = data;
+}
+
 std::pair<int, int> LogicSignal::v_extents() const
 {
 	return make_pair(-SignalHeight - SignalMargin, SignalMargin);
 }
 
-void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
+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 RowItemPaintParams &pp)
+void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
 	QLineF *line;
 
@@ -225,7 +230,7 @@ void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 	delete[] cap_lines;
 }
 
-void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
+void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 {
 	// Draw the trigger marker
 	if (!trigger_match_)
@@ -246,15 +251,15 @@ void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
 		if (!pixmap)
 			continue;
 
-		const int pad = TriggerMarkerPadding;
+		const float pad = TriggerMarkerPadding - 0.5f;
 		const QSize size = pixmap->size();
 		const QPoint point(
 			pp.right() - size.width() - pad * 2,
 			y - (SignalHeight + size.height()) / 2);
 
-		p.setPen(QPen(Qt::NoPen));
+		p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
 		p.setBrush(TriggerMarkerBackgroundColour);
-		p.drawRoundedRect(QRect(point, size).adjusted(
+		p.drawRoundedRect(QRectF(point, size).adjusted(
 			-pad, -pad, pad, pad), pad, pad);
 		p.drawPixmap(point, *pixmap);
 
@@ -316,14 +321,22 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
-	try {
-		const Glib::VariantContainerBase gvar =
-			device_->config_list(ConfigKey::TRIGGER_MATCH);
-		return Glib::VariantBase::cast_dynamic<
-			Glib::Variant<vector<int32_t>>>(gvar).get();
-	} catch (Error e) {
-		return vector<int32_t>();
+	const auto keys = device_->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 =
+				device_->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;
+		}
 	}
+
+	return vector<int32_t>();
 }
 
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
@@ -376,21 +389,23 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	Signal::populate_popup_form(parent, form);
 
-	trigger_bar_ = new QToolBar(parent);
-	init_trigger_actions(trigger_bar_);
-	trigger_bar_->addAction(trigger_none_);
-	trigger_none_->setChecked(!trigger_match_);
-
 	const vector<int32_t> trig_types = get_trigger_types();
-	for (auto type_id : trig_types) {
-		const TriggerMatchType *const type =
-			TriggerMatchType::get(type_id);
-		QAction *const action = action_from_trigger_type(type);
-		trigger_bar_->addAction(action);
-		action->setChecked(trigger_match_ == type);
-	}
-	form->addRow(tr("Trigger"), trigger_bar_);
 
+	if (!trig_types.empty()) {
+		trigger_bar_ = new QToolBar(parent);
+		init_trigger_actions(trigger_bar_);
+		trigger_bar_->addAction(trigger_none_);
+		trigger_none_->setChecked(!trigger_match_);
+
+		for (auto type_id : trig_types) {
+			const TriggerMatchType *const type =
+				TriggerMatchType::get(type_id);
+			QAction *const action = action_from_trigger_type(type);
+			trigger_bar_->addAction(action);
+			action->setChecked(trigger_match_ == type);
+		}
+		form->addRow(tr("Trigger"), trigger_bar_);
+	}
 }
 
 void LogicSignal::modify_trigger()
@@ -422,7 +437,7 @@ void LogicSignal::modify_trigger()
 		new_trigger->stages().empty() ? nullptr : new_trigger);
 
 	if (owner_)
-		owner_->appearance_changed(false, true);
+		owner_->row_item_appearance_changed(false, true);
 }
 
 const QIcon* LogicSignal::get_icon(const char *path)