diff --git a/ApplicationCode/Application/Tools/RiaTextStringTools.cpp b/ApplicationCode/Application/Tools/RiaTextStringTools.cpp index 2f3992b35d..1e4d56fc84 100644 --- a/ApplicationCode/Application/Tools/RiaTextStringTools.cpp +++ b/ApplicationCode/Application/Tools/RiaTextStringTools.cpp @@ -39,3 +39,20 @@ bool RiaTextStringTools::compare(const QString& expected, const QString& actual) return false; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RiaTextStringTools::trimAndRemoveDoubleSpaces(const QString& s) +{ + int length; + QString trimmed = s.trimmed(); + + do + { + length = trimmed.size(); + trimmed = trimmed.replace(" ", " "); + } while (trimmed.size() < length); + + return trimmed; +} + diff --git a/ApplicationCode/Application/Tools/RiaTextStringTools.h b/ApplicationCode/Application/Tools/RiaTextStringTools.h index ee915087f2..e287dc3cf0 100644 --- a/ApplicationCode/Application/Tools/RiaTextStringTools.h +++ b/ApplicationCode/Application/Tools/RiaTextStringTools.h @@ -25,5 +25,6 @@ class QString; //-------------------------------------------------------------------------------------------------- namespace RiaTextStringTools { -bool compare(const QString& expected, const QString& actual); +bool compare(const QString& expected, const QString& actual); +QString trimAndRemoveDoubleSpaces(const QString& s); } diff --git a/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp b/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp index 4b8f283620..5900849a8a 100644 --- a/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp +++ b/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp @@ -25,6 +25,7 @@ #include "RiaDateStringParser.h" #include "RiaLogging.h" #include "RiaStdStringTools.h" +#include "RiaTextStringTools.h" #include "RiaQDateTimeTools.h" #include "../Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h" @@ -194,7 +195,7 @@ bool RifCsvUserDataParser::parseColumnInfo(QTextStream* dataStream, const AsciiD for (int iCol = 0; iCol < colCount; iCol++) { - QString colName = lineColumns[iCol]; + QString colName = RiaTextStringTools::trimAndRemoveDoubleSpaces(lineColumns[iCol]); RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::importedAddress(colName.toStdString()); Column col = Column::createColumnInfoFromCsvData(addr, "");