diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp index 7208182813..3369536087 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp @@ -161,18 +161,15 @@ std::vector RicPasteAsciiDataToSummaryPlotFeature::parseCurv return curves; } - int numColumns = static_cast(parser.headers().size()); - std::map< CurveType, std::vector > curveToTypeMap; QString curvePrefix = settings.curvePrefix(); - std::vector< std::vector > values = parser.values(); - for (size_t i = 0; i < parser.values().size(); ++i) + for (size_t i = 0; i < parser.headers().size(); i++) { RimAsciiDataCurve* curve = new RimAsciiDataCurve(); curve->setTimeSteps(parser.timeSteps()); - curve->setValues(parser.values()[i]); + curve->setValues(parser.columnValues(i)); if (curvePrefix.isEmpty()) { curve->setTitle(parser.headers()[i]); diff --git a/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.cpp b/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.cpp index 43a7b9dbe0..1b8dcc6c89 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.cpp +++ b/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.cpp @@ -20,6 +20,8 @@ #include "RiaLogging.h" +#include "cvfAssert.h" + #include #include #include @@ -51,33 +53,13 @@ const std::vector& RifColumnBasedAsciiParser::timeSteps() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const std::vector RifColumnBasedAsciiParser::columnValues(size_t columnIndex) const +const std::vector& RifColumnBasedAsciiParser::columnValues(size_t columnIndex) const { - if (m_data.m_values.size() <= columnIndex) - { - std::vector dummy; - return dummy; - } + CVF_TIGHT_ASSERT(m_data.m_values.size() <= columnIndex); return m_data.m_values[columnIndex]; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -const std::vector< std::vector >& RifColumnBasedAsciiParser::values() const -{ - return m_data.m_values; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -const size_t RifColumnBasedAsciiParser::columnCount() const -{ - return m_data.m_values.size(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.h b/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.h index 1fb28551d6..29f53d114f 100644 --- a/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.h +++ b/ApplicationCode/FileInterface/RifColumnBasedAsciiParser.h @@ -35,9 +35,7 @@ public: const std::vector& headers() const; const std::vector& timeSteps() const; - const std::vector columnValues(size_t columnIndex) const; - const std::vector>& values() const; - const size_t columnCount() const; + const std::vector& columnValues(size_t columnIndex) const; private: void parseData(QString& data, QString dateFormat, QLocale decimalLocale, QString cellSeparator);