X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=81ddd6e92ea4a925b0eb9d06e22b417d4f8f83cc;hb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d;hp=b0fe95135eb782e9231d98d63dadf398a9cb6fda;hpb=767281c8881e4ed35607cbff4b270dfd55d0ef67;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b0fe951..81ddd6e 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -22,16 +22,24 @@
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #include "logicsignal.h"
 #include "view.h"
 
-#include "pv/sigsession.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
-#include "pv/view/view.h"
+#include <pv/sigsession.h>
+#include <pv/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -55,9 +63,10 @@ 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,
+	shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
 	shared_ptr<data::Logic> data) :
-	Signal(session, probe),
+	Signal(session, dev_inst, probe),
 	_data(data),
 	_trigger_none(NULL),
 	_trigger_rising(NULL),
@@ -73,7 +82,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+	return _data;
+}
+
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
 	return _data;
 }
@@ -118,7 +132,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)
@@ -155,7 +169,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
 	delete[] edge_lines;
 
 	// Paint the caps
-	const unsigned int max_cap_line_count = (edges.size() - 1);
+	const unsigned int max_cap_line_count = edges.size();
 	QLineF *const cap_lines = new QLineF[max_cap_line_count];
 
 	p.setPen(HighColour);
@@ -234,9 +248,10 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	Signal::populate_popup_form(parent, 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)
+	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
+	assert(dev_inst);
+
+	if (!(gvar = dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);
@@ -290,7 +305,12 @@ void LogicSignal::set_trigger(char type)
 	const char *const trigger_string =
 		(type != 0) ? trigger_type_string : NULL;
 
-	const sr_dev_inst *const sdi = _session.get_device();
+	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
+	assert(dev_inst);
+
+	const sr_dev_inst *const sdi = dev_inst->dev_inst();
+	assert(sdi);
+
 	const int probe_count = g_slist_length(sdi->probes);
 	assert(probe_count > 0);