X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=ae4f11e29eca7195b0bd720c599a262fbfcc5784;hp=b0fe95135eb782e9231d98d63dadf398a9cb6fda;hb=9d28da5ae394e572dedf0ec22c17fd259825e1c9;hpb=767281c8881e4ed35607cbff4b270dfd55d0ef67

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b0fe9513..ae4f11e2 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -22,6 +22,9 @@
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #include "logicsignal.h"
 #include "view.h"
 
@@ -55,7 +58,7 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe,
 	shared_ptr<data::Logic> data) :
 	Signal(session, probe),
 	_data(data),
@@ -73,7 +76,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+	return _data;
+}
+
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
 	return _data;
 }
@@ -118,7 +126,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 
-	double samplerate = _data->get_samplerate();
+	double samplerate = _data->samplerate();
 
 	// Show sample rate as 1Hz when it is unknown
 	if (samplerate == 0.0)
@@ -235,8 +243,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	// 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)
+	if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
+		&gvar) == SR_OK)
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);