X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=bc6e09fa2aaf9e63adad840686ec7d3cdd634e98;hb=19adbc2c342b190161ec1223377a3619974b91f7;hp=e240ebad751307e15cfcc926e9f2481f2a092f22;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index e240eba..bc6e09f 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -28,10 +28,11 @@
 #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 boost::shared_ptr;
 using std::deque;
@@ -80,12 +81,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
 	return _data;
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
 	return _data;
 }
@@ -167,7 +168,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);
@@ -246,7 +247,12 @@ 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();
+	boost::shared_ptr<DevInst> dev_inst = _session.get_device();
+	assert(dev_inst);
+
+	const sr_dev_inst *const sdi = dev_inst->dev_inst();
+	assert(sdi);
+
 	if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
 		&gvar) == SR_OK)
 	{
@@ -302,7 +308,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);