From 622161776ec2b3642d5407f60ac59bf4b4644e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Tue, 28 Nov 2017 11:35:17 +0100 Subject: [PATCH] CSV import. Rename ColumnInfo to Column --- .../RicPasteAsciiDataToSummaryPlotFeature.cpp | 4 +-- ...icPasteAsciiDataToSummaryPlotFeatureUi.cpp | 4 +-- .../FileInterface/RifColumnBasedUserData.cpp | 18 +++++----- .../RifColumnBasedUserDataParser.cpp | 6 ++-- .../RifColumnBasedUserDataParser.h | 4 +-- .../FileInterface/RifCsvUserData.cpp | 10 +++--- .../FileInterface/RifCsvUserDataParser.cpp | 34 +++++++++---------- .../FileInterface/RifCsvUserDataParser.h | 8 ++--- .../RifEclipseUserDataParserTools.cpp | 24 ++++++------- .../RifEclipseUserDataParserTools.h | 22 ++++++------ .../FileInterface/RifReaderObservedData.cpp | 4 +-- 11 files changed, 69 insertions(+), 69 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp index 156bd541e5..8b4f012ff8 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp @@ -182,8 +182,8 @@ std::vector RicPasteAsciiDataToSummaryPlotFeature::parseCurv for (size_t i = 0; i < parser.tableData().columnInfos().size(); i++) { - const ColumnInfo* col = parser.columnInfo(i); - if (col->dataType != ColumnInfo::NUMERIC) continue; + const Column* col = parser.columnInfo(i); + if (col->dataType != Column::NUMERIC) continue; RimAsciiDataCurve* curve = new RimAsciiDataCurve(); curve->setTimeSteps(parser.dateTimeColumn()->dateTimeValues); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp index 74d0b719a7..84f474c0a0 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp @@ -300,9 +300,9 @@ QList RicPasteAsciiDataToSummaryPlotFeatureUi::calculate if (fieldNeedingOptions == &m_timeSeriesColumnName) { - const std::vector& columnInfoList = m_parser->tableData().columnInfos(); + const std::vector& columnInfoList = m_parser->tableData().columnInfos(); - for (const ColumnInfo& columnInfo : columnInfoList) + for (const Column& columnInfo : columnInfoList) { QString columnName = QString::fromStdString(columnInfo.columnName()); options.push_back(caf::PdmOptionItemInfo(columnName, columnName)); diff --git a/ApplicationCode/FileInterface/RifColumnBasedUserData.cpp b/ApplicationCode/FileInterface/RifColumnBasedUserData.cpp index b157fa2cf1..7ddca9752e 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedUserData.cpp +++ b/ApplicationCode/FileInterface/RifColumnBasedUserData.cpp @@ -82,7 +82,7 @@ bool RifColumnBasedUserData::values(const RifEclipseSummaryAddress& resultAddres { std::pair tableColIndices = search->second; - const ColumnInfo* ci = m_parser->columnInfo(tableColIndices.first, tableColIndices.second); + const Column* ci = m_parser->columnInfo(tableColIndices.first, tableColIndices.second); if (!ci) return false; if (!ci->values.empty()) @@ -125,7 +125,7 @@ std::string RifColumnBasedUserData::unitName(const RifEclipseSummaryAddress& res { std::pair tableColIndices = search->second; - const ColumnInfo* ci = m_parser->columnInfo(tableColIndices.first, tableColIndices.second); + const Column* ci = m_parser->columnInfo(tableColIndices.first, tableColIndices.second); if (ci) { return ci->unitName; @@ -158,8 +158,8 @@ void RifColumnBasedUserData::buildTimeStepsAndMappings() for (size_t columIndex = 0; columIndex < tableData.columnInfos().size(); columIndex++) { - const ColumnInfo& ci = tableData.columnInfos()[columIndex]; - if (ci.dataType == ColumnInfo::NUMERIC) + const Column& ci = tableData.columnInfos()[columIndex]; + if (ci.dataType == Column::NUMERIC) { RifEclipseSummaryAddress sumAddress = ci.summaryAddress; @@ -188,7 +188,7 @@ std::vector RifColumnBasedUserData::createTimeSteps(const TableData& tab for (size_t columIndex = 0; columIndex < tableData.columnInfos().size(); columIndex++) { - const ColumnInfo& ci = tableData.columnInfos()[columIndex]; + const Column& ci = tableData.columnInfos()[columIndex]; if (dateColumnIndex == tableData.columnInfos().size() && RifEclipseUserDataKeywordTools::isDate(ci.summaryAddress.quantityName())) @@ -221,7 +221,7 @@ std::vector RifColumnBasedUserData::createTimeSteps(const TableData& tab // YEARX is interpreted as absolute decimal year (2014.32) if (tsVector.empty() && yearXColumnIndex != tableData.columnInfos().size()) { - const ColumnInfo& ci = tableData.columnInfos()[yearXColumnIndex]; + const Column& ci = tableData.columnInfos()[yearXColumnIndex]; for (const auto& timeStepValue : ci.values) { @@ -233,7 +233,7 @@ std::vector RifColumnBasedUserData::createTimeSteps(const TableData& tab // DAYS is interpreted as decimal days since simulation start (23.32) if (tsVector.empty() && daysColumnIndex != tableData.columnInfos().size()) { - const ColumnInfo& ci = tableData.columnInfos()[daysColumnIndex]; + const Column& ci = tableData.columnInfos()[daysColumnIndex]; QDateTime simulationStartDate = tableData.findFirstDate(); @@ -247,7 +247,7 @@ std::vector RifColumnBasedUserData::createTimeSteps(const TableData& tab // YEARS is interpreted as decimal years since simulation start (23.32) if (tsVector.empty() && yearsColumnIndex != tableData.columnInfos().size()) { - const ColumnInfo& ci = tableData.columnInfos()[yearsColumnIndex]; + const Column& ci = tableData.columnInfos()[yearsColumnIndex]; QDateTime simulationStartDate = tableData.findFirstDate(); @@ -261,7 +261,7 @@ std::vector RifColumnBasedUserData::createTimeSteps(const TableData& tab // DATE is interpreted as date string (6-NOV-1997) if (tsVector.empty() && dateColumnIndex != tableData.columnInfos().size()) { - const ColumnInfo& ci = tableData.columnInfos()[dateColumnIndex]; + const Column& ci = tableData.columnInfos()[dateColumnIndex]; QString dateFormat; for (auto s : ci.textValues) diff --git a/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp b/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp index cb77b9b0dd..004840f0dd 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp +++ b/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp @@ -53,7 +53,7 @@ const std::vector& RifColumnBasedUserDataParser::tableData() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const ColumnInfo* RifColumnBasedUserDataParser::columnInfo(size_t tableIndex, size_t columnIndex) const +const Column* RifColumnBasedUserDataParser::columnInfo(size_t tableIndex, size_t columnIndex) const { if (tableIndex >= m_tableDatas.size()) return nullptr; @@ -100,7 +100,7 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data) } } - std::vector& columnInfos = table.columnInfos(); + std::vector& columnInfos = table.columnInfos(); int columnCount = static_cast(columnInfos.size()); if (columnCount == 0) break; @@ -131,7 +131,7 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data) for (int i = 0; i < columnCount; i++) { - if (columnInfos[i].dataType == ColumnInfo::TEXT) + if (columnInfos[i].dataType == Column::TEXT) { columnInfos[i].textValues.push_back(entries[i].toStdString()); } diff --git a/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h b/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h index e78c033bea..7c20e2fcd9 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h +++ b/ApplicationCode/FileInterface/RifColumnBasedUserDataParser.h @@ -25,7 +25,7 @@ #include -class ColumnInfo; +class Column; class TableData; //================================================================================================== @@ -37,7 +37,7 @@ public: RifColumnBasedUserDataParser(const QString& data, QString* errorText = nullptr); const std::vector& tableData() const; - const ColumnInfo* columnInfo(size_t tableIndex, size_t columnIndex) const; + const Column* columnInfo(size_t tableIndex, size_t columnIndex) const; private: void parseTableData(const QString& data); diff --git a/ApplicationCode/FileInterface/RifCsvUserData.cpp b/ApplicationCode/FileInterface/RifCsvUserData.cpp index 601953d9e9..a07ddbe757 100644 --- a/ApplicationCode/FileInterface/RifCsvUserData.cpp +++ b/ApplicationCode/FileInterface/RifCsvUserData.cpp @@ -81,7 +81,7 @@ bool RifCsvUserData::values(const RifEclipseSummaryAddress& resultAddress, std:: { size_t columnIndex = search->second; - const ColumnInfo* ci = m_parser->columnInfo(columnIndex); + const Column* ci = m_parser->columnInfo(columnIndex); if (!ci) return false; values->clear(); @@ -121,7 +121,7 @@ std::string RifCsvUserData::unitName(const RifEclipseSummaryAddress& resultAddre { size_t columnIndex = search->second; - const ColumnInfo* ci = m_parser->columnInfo(columnIndex); + const Column* ci = m_parser->columnInfo(columnIndex); if (ci) { return ci->unitName; @@ -153,8 +153,8 @@ void RifCsvUserData::buildTimeStepsAndMappings() for (size_t columnIndex = 0; columnIndex < tableData.columnInfos().size(); columnIndex++) { - const ColumnInfo& ci = tableData.columnInfos()[columnIndex]; - if (ci.dataType == ColumnInfo::NUMERIC) + const Column& ci = tableData.columnInfos()[columnIndex]; + if (ci.dataType == Column::NUMERIC) { RifEclipseSummaryAddress sumAddress = ci.summaryAddress; @@ -173,7 +173,7 @@ std::vector RifCsvUserData::createTimeSteps(const TableData& tableData) { std::vector tsVector; - const ColumnInfo& col = tableData.columnInfos()[0]; + const Column& col = tableData.columnInfos()[0]; tsVector.reserve(col.dateTimeValues.size()); for (const QDateTime& qdt : col.dateTimeValues) diff --git a/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp b/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp index 1e60a74856..21f4425c8b 100644 --- a/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp +++ b/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp @@ -72,7 +72,7 @@ const TableData& RifCsvUserDataParser::tableData() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const ColumnInfo* RifCsvUserDataParser::columnInfo(size_t columnIndex) const +const Column* RifCsvUserDataParser::columnInfo(size_t columnIndex) const { if (columnIndex >= m_tableData.columnInfos().size()) return nullptr; @@ -82,11 +82,11 @@ const ColumnInfo* RifCsvUserDataParser::columnInfo(size_t columnIndex) const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const ColumnInfo* RifCsvUserDataParser::dateTimeColumn() const +const Column* RifCsvUserDataParser::dateTimeColumn() const { - for (const ColumnInfo& col : m_tableData.columnInfos()) + for (const Column& col : m_tableData.columnInfos()) { - if (col.dataType == ColumnInfo::DATETIME) + if (col.dataType == Column::DATETIME) { return &col; } @@ -100,7 +100,7 @@ const ColumnInfo* RifCsvUserDataParser::dateTimeColumn() const bool RifCsvUserDataParser::parseColumnInfo(const AsciiDataParseOptions& parseOptions) { QTextStream* dataStream = openDataStream(); - std::vector columnInfoList; + std::vector columnInfoList; bool result = parseColumnInfo(dataStream, parseOptions, &columnInfoList); if (result) @@ -170,7 +170,7 @@ QString RifCsvUserDataParser::previewText(int lineCount, const AsciiDataParseOpt //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RifCsvUserDataParser::parseColumnInfo(QTextStream* dataStream, const AsciiDataParseOptions& parseOptions, std::vector* columnInfoList) +bool RifCsvUserDataParser::parseColumnInfo(QTextStream* dataStream, const AsciiDataParseOptions& parseOptions, std::vector* columnInfoList) { bool headerFound = false; @@ -190,7 +190,7 @@ bool RifCsvUserDataParser::parseColumnInfo(QTextStream* dataStream, const AsciiD { QString colName = lineColumns[iCol]; RifEclipseSummaryAddress addr = RifEclipseSummaryAddress::importedAddress(colName.toStdString()); - ColumnInfo col = ColumnInfo::createColumnInfoFromCsvData(addr, ""); + Column col = Column::createColumnInfoFromCsvData(addr, ""); columnInfoList->push_back(col); } @@ -208,7 +208,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions) bool errors = false; enum { FIRST_DATA_ROW, DATA_ROW } parseState = FIRST_DATA_ROW; int colCount; - std::vector columnInfoList; + std::vector columnInfoList; QTextStream* dataStream = openDataStream(); @@ -238,24 +238,24 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions) for (int iCol = 0; iCol < colCount; iCol++) { std::string colData = lineColumns[iCol].toStdString(); - ColumnInfo& col = columnInfoList[iCol]; + Column& col = columnInfoList[iCol]; // Determine column data type - if (col.dataType == ColumnInfo::NONE) + if (col.dataType == Column::NONE) { if (QString::fromStdString(col.summaryAddress.quantityName()) == parseOptions.timeSeriesColumnName) { - col.dataType = ColumnInfo::DATETIME; + col.dataType = Column::DATETIME; } else { if (RiaStdStringTools::isNumber(colData, parseOptions.locale.decimalPoint().toAscii())) { - col.dataType = ColumnInfo::NUMERIC; + col.dataType = Column::NUMERIC; } else { - col.dataType = ColumnInfo::TEXT; + col.dataType = Column::TEXT; } } } @@ -269,11 +269,11 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions) for (int iCol = 0; iCol < colCount; iCol++) { QString& colData = lineColumns[iCol]; - ColumnInfo& col = columnInfoList[iCol]; + Column& col = columnInfoList[iCol]; try { - if (col.dataType == ColumnInfo::NUMERIC) + if (col.dataType == Column::NUMERIC) { bool parseOk = true; double value = parseOptions.locale.toDouble(colData, &parseOk); @@ -292,11 +292,11 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions) } col.values.push_back(value); } - else if (col.dataType == ColumnInfo::TEXT) + else if (col.dataType == Column::TEXT) { col.textValues.push_back(colData.toStdString()); } - else if (col.dataType == ColumnInfo::DATETIME) + else if (col.dataType == Column::DATETIME) { QDateTime dt; dt = tryParseDateTime(colData.toStdString(), parseOptions.dateTimeFormat); diff --git a/ApplicationCode/FileInterface/RifCsvUserDataParser.h b/ApplicationCode/FileInterface/RifCsvUserDataParser.h index 4219d3348c..2f980014cd 100644 --- a/ApplicationCode/FileInterface/RifCsvUserDataParser.h +++ b/ApplicationCode/FileInterface/RifCsvUserDataParser.h @@ -31,7 +31,7 @@ #include -class ColumnInfo; +class Column; class AsciiDataParseOptions; //================================================================================================== @@ -46,8 +46,8 @@ public: bool parse(const AsciiDataParseOptions& parseOptions); const TableData& tableData() const; - const ColumnInfo* columnInfo(size_t columnIndex) const; - const ColumnInfo* dateTimeColumn() const; + const Column* columnInfo(size_t columnIndex) const; + const Column* dateTimeColumn() const; bool parseColumnInfo(const AsciiDataParseOptions& parseOptions); QString previewText(int lineCount, const AsciiDataParseOptions& parseOptions); @@ -64,7 +64,7 @@ protected: private: bool parseColumnInfo(QTextStream* dataStream, const AsciiDataParseOptions& parseOptions, - std::vector* columnInfoList); + std::vector* columnInfoList); bool parseData(const AsciiDataParseOptions& parseOptions); QString columnifyText(const QString& text, const QString& cellSeparator); static QStringList splitLineAndTrim(const QString& line, const QString& separator); diff --git a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp index 45cc595f46..fb95abe128 100644 --- a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.cpp @@ -461,7 +461,7 @@ TableData RifEclipseUserDataParserTools::tableDataFromText(std::stringstream& st } - std::vector columnInfos; + std::vector columnInfos; // Create string vectors for each column { @@ -494,7 +494,7 @@ TableData RifEclipseUserDataParserTools::tableDataFromText(std::stringstream& st RifEclipseSummaryAddress adr = RifEclipseUserDataKeywordTools::makeAndFillAddress(quantity, columnHeader); - ColumnInfo ci = ColumnInfo::createColumnInfoFromRsmData(quantity, unit, adr); + Column ci = Column::createColumnInfoFromRsmData(quantity, unit, adr); columnInfos.push_back(ci); } @@ -563,7 +563,7 @@ bool RifEclipseUserDataParserTools::hasCompleteDataForAllHeaderColumns(const std //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RifEclipseUserDataParserTools::columnInfoForFixedColumnWidth(std::stringstream& streamData) +std::vector RifEclipseUserDataParserTools::columnInfoForFixedColumnWidth(std::stringstream& streamData) { auto headerLines = RifEclipseUserDataParserTools::findValidHeaderLines(streamData); @@ -722,9 +722,9 @@ std::vector> RifEclipseUserDataParserTools::splitIntoCo //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RifEclipseUserDataParserTools::columnInfoFromColumnHeaders(const std::vector>& columnData) +std::vector RifEclipseUserDataParserTools::columnInfoFromColumnHeaders(const std::vector>& columnData) { - std::vector table; + std::vector table; bool isUnitsDetected = false; bool isScalingDetected = false; @@ -774,7 +774,7 @@ std::vector RifEclipseUserDataParserTools::columnInfoFromColumnHeade RifEclipseSummaryAddress adr = RifEclipseUserDataKeywordTools::makeAndFillAddress(quantity, restOfHeader); - ColumnInfo ci = ColumnInfo::createColumnInfoFromRsmData(quantity, unit, adr); + Column ci = Column::createColumnInfoFromRsmData(quantity, unit, adr); table.push_back(ci); } @@ -921,7 +921,7 @@ bool RifEclipseUserDataParserTools::isScalingText(const std::string& word) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::string ColumnInfo::columnName() const +std::string Column::columnName() const { return summaryAddress.quantityName(); } @@ -929,7 +929,7 @@ std::string ColumnInfo::columnName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -size_t ColumnInfo::itemCount() const +size_t Column::itemCount() const { switch (dataType) { @@ -943,9 +943,9 @@ size_t ColumnInfo::itemCount() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -ColumnInfo ColumnInfo::createColumnInfoFromRsmData(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr) +Column Column::createColumnInfoFromRsmData(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr) { - ColumnInfo ci(adr, unit); + Column ci(adr, unit); if (RifEclipseUserDataKeywordTools::isDate(quantity)) { @@ -965,9 +965,9 @@ ColumnInfo ColumnInfo::createColumnInfoFromRsmData(const std::string& quantity, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -ColumnInfo ColumnInfo::createColumnInfoFromCsvData(const RifEclipseSummaryAddress& addr, const std::string& unit) +Column Column::createColumnInfoFromCsvData(const RifEclipseSummaryAddress& addr, const std::string& unit) { - ColumnInfo col(addr, unit); + Column col(addr, unit); return col; } diff --git a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h index d54a264856..3d76c5e812 100644 --- a/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h +++ b/ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h @@ -31,7 +31,7 @@ //================================================================================================== /// //================================================================================================== -class ColumnInfo +class Column { public: enum DataType @@ -42,13 +42,13 @@ public: DATETIME }; - ColumnInfo() + Column() : scaleFactor(1.0), dataType(NONE) { } - ColumnInfo(const RifEclipseSummaryAddress& adr, const std::string& unit) + Column(const RifEclipseSummaryAddress& adr, const std::string& unit) : summaryAddress(adr), scaleFactor(1.0), unitName(unit), @@ -60,8 +60,8 @@ public: size_t itemCount() const; public: - static ColumnInfo createColumnInfoFromRsmData(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr); - static ColumnInfo createColumnInfoFromCsvData(const RifEclipseSummaryAddress& addr, const std::string& unit); + static Column createColumnInfoFromRsmData(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr); + static Column createColumnInfoFromCsvData(const RifEclipseSummaryAddress& addr, const std::string& unit); RifEclipseSummaryAddress summaryAddress; std::string unitName; @@ -86,7 +86,7 @@ public: TableData(const std::string& origin, const std::string& startDate, - const std::vector& columnInfos) + const std::vector& columnInfos) : m_origin(origin), m_startDate(startDate), m_columnInfos(columnInfos) @@ -103,12 +103,12 @@ public: return m_startDate; } - std::vector& columnInfos() + std::vector& columnInfos() { return m_columnInfos; } - const std::vector& columnInfos() const + const std::vector& columnInfos() const { return m_columnInfos; } @@ -119,7 +119,7 @@ private: std::string m_origin; std::string m_startDate; - std::vector m_columnInfos; + std::vector m_columnInfos; }; //================================================================================================== @@ -149,10 +149,10 @@ public: static bool isFixedWidthHeader(const std::string& lines); static bool hasCompleteDataForAllHeaderColumns(const std::string& lines); - static std::vector columnInfoForFixedColumnWidth(std::stringstream& streamData); + static std::vector columnInfoForFixedColumnWidth(std::stringstream& streamData); static std::vector findValidHeaderLines(std::stringstream& streamData); static std::vector> splitIntoColumnHeaders(const std::vector& headerLines); - static std::vector columnInfoFromColumnHeaders(const std::vector>& columnData); + static std::vector columnInfoFromColumnHeaders(const std::vector>& columnData); static std::vector columnIndexForWords(const std::string& line); static std::vector mergeEqualTimeSteps(const std::vector& tables); diff --git a/ApplicationCode/FileInterface/RifReaderObservedData.cpp b/ApplicationCode/FileInterface/RifReaderObservedData.cpp index 58ae98a659..ac65811efa 100644 --- a/ApplicationCode/FileInterface/RifReaderObservedData.cpp +++ b/ApplicationCode/FileInterface/RifReaderObservedData.cpp @@ -105,8 +105,8 @@ bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress if (columnIndex != m_allResultAddresses.size()) { - const ColumnInfo* col = m_asciiParser->columnInfo(columnIndex); - if (col && col->dataType == ColumnInfo::NUMERIC) + const Column* col = m_asciiParser->columnInfo(columnIndex); + if (col && col->dataType == Column::NUMERIC) { for (auto& v : col->values) {