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

List:       kde-commits
Subject:    [labplot] src/backend/datasources/filters: binary filter code cleanup
From:       Stefan Gerlach <stefan.gerlach () uni-konstanz ! de>
Date:       2015-05-10 22:23:25
Message-ID: E1YrZd7-0006wT-Qy () scm ! kde ! org
[Download RAW message or body]

Git commit 5d0b755741568237b64cd2300cc74fa8d881f3c3 by Stefan Gerlach.
Committed on 10/05/2015 at 22:23.
Pushed by sgerlach into branch 'master'.

binary filter code cleanup

M  +9    -9    src/backend/datasources/filters/BinaryFilter.cpp

http://commits.kde.org/labplot/5d0b755741568237b64cd2300cc74fa8d881f3c3

diff --git a/src/backend/datasources/filters/BinaryFilter.cpp \
b/src/backend/datasources/filters/BinaryFilter.cpp index 6c2b98c..a9c26d9 100644
--- a/src/backend/datasources/filters/BinaryFilter.cpp
+++ b/src/backend/datasources/filters/BinaryFilter.cpp
@@ -260,15 +260,15 @@ void BinaryFilterPrivate::read(const QString & fileName, \
AbstractDataSource* dat  
 	if (mode==AbstractFileFilter::Append){
 		columnOffset=dataSource->childCount<Column>();
-		for ( int n=1; n<=vectors; n++ ){
-			newColumn = new Column(vectorNameList.at(n-1), AbstractColumn::Numeric);
+		for ( int n=0; n<vectors; n++ ){
+			newColumn = new Column(vectorNameList.at(n), AbstractColumn::Numeric);
 			newColumn->setUndoAware(false);
 			dataSource->addChild(newColumn);
 		}
 	}else if (mode==AbstractFileFilter::Prepend){
 		Column* firstColumn = dataSource->child<Column>(0);
-		for ( int n=1; n<=vectors; n++ ){
-			newColumn = new Column(vectorNameList.at(n-1), AbstractColumn::Numeric);
+		for ( int n=0; n<vectors; n++ ){
+			newColumn = new Column(vectorNameList.at(n), AbstractColumn::Numeric);
 			newColumn->setUndoAware(false);
 			dataSource->insertChildBefore(newColumn, firstColumn);
 		}
@@ -279,7 +279,7 @@ void BinaryFilterPrivate::read(const QString & fileName, \
AbstractDataSource* dat  if (columns > vectors){
 			//there're more columns in the data source then required
 			//-> remove the superfluous columns
-			for(int i=0;i<columns-(vectors);i++) {
+			for(int i=0;i<columns-vectors;i++) {
 				dataSource->removeChild(dataSource->child<Column>(0));
 			}
 
@@ -336,8 +336,8 @@ void BinaryFilterPrivate::read(const QString & fileName, \
AbstractDataSource* dat  
 	// pointers to the actual data containers
 	QVector<QVector<double>*> dataPointers;
-	for ( int n=1; n<=vectors; n++ ){
-		QVector<double>* vector = static_cast<QVector<double>* \
>(dataSource->child<Column>(columnOffset+n-1)->data()); +	for ( int n=0; n<vectors; \
> n++ ){
+		QVector<double>* vector = static_cast<QVector<double>* \
>(dataSource->child<Column>(columnOffset+n)->data());  vector->reserve(actualRows);
 		vector->resize(actualRows);
 		dataPointers.push_back(vector);
@@ -414,8 +414,8 @@ void BinaryFilterPrivate::read(const QString & fileName, \
AbstractDataSource* dat  }
 
 	QString comment = i18np("numerical data, %1 element", "numerical data, %1 \
                elements", actualRows);
-	for ( int n=1; n<=vectors; n++ ){
-		Column* column = spreadsheet->column(columnOffset+n-1);
+	for ( int n=0; n<vectors; n++ ){
+		Column* column = spreadsheet->column(columnOffset+n);
 		column->setComment(comment);
 		column->setUndoAware(true);
 		if (mode==AbstractFileFilter::Replace) {


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