[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot] src/backend/datasources: [live data] fix reading from file and better debugging
From:       Stefan Gerlach <null () kde ! org>
Date:       2018-07-24 21:15:13
Message-ID: E1fi4eH-0000ne-C8 () code ! kde ! org
[Download RAW message or body]

Git commit c21b192a1a411472aa9cd721f8f604e1a6d82142 by Stefan Gerlach.
Committed on 24/07/2018 at 21:15.
Pushed by sgerlach into branch 'master'.

[live data] fix reading from file and better debugging

M  +1    -1    src/backend/datasources/LiveDataSource.cpp
M  +8    -4    src/backend/datasources/filters/AsciiFilter.cpp

https://commits.kde.org/labplot/c21b192a1a411472aa9cd721f8f604e1a6d82142

diff --git a/src/backend/datasources/LiveDataSource.cpp \
b/src/backend/datasources/LiveDataSource.cpp index 0083ef43..792cc1fa 100644
--- a/src/backend/datasources/LiveDataSource.cpp
+++ b/src/backend/datasources/LiveDataSource.cpp
@@ -555,7 +555,7 @@ void LiveDataSource::read() {
 
 	switch (m_sourceType) {
 	case FileOrPipe:
-		DEBUG("Reading FileOrPipe. type = " << \
ENUM_TO_STRING(LiveDataSource,FileType,m_fileType)); +		DEBUG("Reading FileOrPipe. \
type = " << ENUM_TO_STRING(AbstractFileFilter, FileType, m_fileType));  switch \
(m_fileType) {  case AbstractFileFilter::Ascii:
 			if (m_readingType == LiveDataSource::ReadingType::WholeFile) {
diff --git a/src/backend/datasources/filters/AsciiFilter.cpp \
b/src/backend/datasources/filters/AsciiFilter.cpp index bba86d7a..f1049055 100644
--- a/src/backend/datasources/filters/AsciiFilter.cpp
+++ b/src/backend/datasources/filters/AsciiFilter.cpp
@@ -718,7 +718,7 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& device, \
AbstractDataSou  else
 			readingType = spreadsheet->readingType();
 	}
-	DEBUG("	reading type = " << ENUM_TO_STRING(LiveDataSource, ReadingType, \
readingType)); +	DEBUG("	Reading type = " << ENUM_TO_STRING(LiveDataSource, \
ReadingType, readingType));  
 	//move to the last read position, from == total bytes read
 	//since the other source types are sequencial we cannot seek on them
@@ -750,6 +750,8 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& device, \
AbstractDataSou  newData[newDataIdx++] = device.read(device.bytesAvailable());
 					break;
 				case LiveDataSource::SourceType::FileOrPipe:
+					newData.push_back(device.readLine());
+					break;
 				case LiveDataSource::SourceType::NetworkTcpSocket:
 				//TODO: check serial port
 				case LiveDataSource::SourceType::SerialPort:
@@ -764,6 +766,8 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& device, \
AbstractDataSou  newData.push_back(device.read(device.bytesAvailable()));
 					break;
 				case LiveDataSource::SourceType::FileOrPipe:
+					newData.push_back(device.readLine());
+					break;
 				case LiveDataSource::SourceType::NetworkTcpSocket:
 				//TODO: check serial port
 				case LiveDataSource::SourceType::SerialPort:
@@ -1018,7 +1022,7 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& \
device, AbstractDataSou  }
 
 		for (; row < linesToRead; ++row) {
-			DEBUG("	row = " << row);
+			DEBUG("Reading row " << row << " of " << linesToRead);
 			QString line;
 			if (readingType == LiveDataSource::ReadingType::FromEnd)
 				line = newData.at(newDataIdx++);
@@ -1032,7 +1036,7 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& \
device, AbstractDataSou  }
 			}
 
-			//qDebug() << "line bytes: " << line.size() << " line: " << line;
+			DEBUG("line bytes: " << line.size() << " line: " << line.toStdString());
 			if (simplifyWhitespacesEnabled)
 				line = line.simplified();
 
@@ -1047,7 +1051,7 @@ qint64 AsciiFilterPrivate::readFromLiveDevice(QIODevice& \
                device, AbstractDataSou
 				lineStringList = line.split(m_separator, \
(QString::SplitBehavior)skipEmptyParts);  else
 				lineStringList << line;
-			QDEBUG(" line = " << lineStringList << ", separator = \'" << m_separator << \
"\'"); +			QDEBUG("	line = " << lineStringList << ", separator = \'" << m_separator \
<< "\'");  
 			if (createIndexEnabled) {
 				if (spreadsheet->keepNValues() == 0)


[prev in list] [next in list] [prev in thread] [next in thread]