X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=d23da5bbf021815a5b668ccfb624ebfb401d9e38;hb=8782a1fdb4cd6e73ad068599f06292a2cecd4d7e;hp=b2302e9e8cc75be8dd9a0aaca05d24a0b02e62d2;hpb=8d44d030c3923055f2ea81d5334d3a3bce7900c2;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b2302e9e..d23da5bb 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -23,8 +23,8 @@
 #include <math.h>
 
 #include "logicsignal.h"
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -51,7 +51,7 @@ const QColor LogicSignal::LogicSignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
+LogicSignal::LogicSignal(QString name, shared_ptr<data::Logic> data,
 	int probe_index) :
 	Signal(name),
 	_probe_index(probe_index),
@@ -75,12 +75,12 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
 	const float high_offset = rect.top() + 0.5f;
 	const float low_offset = rect.bottom() + 0.5f;
 
-	const deque< shared_ptr<pv::LogicDataSnapshot> > &snapshots =
+	const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
 		_data->get_snapshots();
-	if(snapshots.empty())
+	if (snapshots.empty())
 		return;
 
-	const shared_ptr<pv::LogicDataSnapshot> &snapshot =
+	const shared_ptr<pv::data::LogicSnapshot> &snapshot =
 		snapshots.front();
 
 	const double pixels_offset = offset / scale;
@@ -102,7 +102,7 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
 	QLineF *const edge_lines = new QLineF[edge_count];
 	line = edge_lines;
 
-	for(vector<pv::LogicDataSnapshot::EdgePair>::const_iterator i =
+	for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
 			edges.begin() + 1;
 		i != edges.end() - 1; i++) {
 		const float x = ((*i).first / samples_per_pixel -
@@ -135,9 +135,9 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 {
 	QLineF *line = lines;
 
-	for(vector<pv::LogicDataSnapshot::EdgePair>::const_iterator i =
+	for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
 		edges.begin(); i != (edges.end() - 1); i++)
-		if((*i).second == level) {
+		if ((*i).second == level) {
 			*line++ = QLineF(
 				((*i).first / samples_per_pixel -
 					pixels_offset) + x_offset, y_offset,