OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1816 Observed data: Remove superfluous functions in column ascii parser

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-21 14:51:45 +02:00
parent 1309424835
commit 797c040057
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@ -161,18 +161,15 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
return curves;
}
int numColumns = static_cast<int>(parser.headers().size());
std::map< CurveType, std::vector<RimAsciiDataCurve*> > curveToTypeMap;
QString curvePrefix = settings.curvePrefix();
std::vector< std::vector<double> > 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]);

26
ApplicationCode/FileInterface/RifColumnBasedAsciiParser.cpp
View File

@ -20,6 +20,8 @@
#include "RiaLogging.h"
#include "cvfAssert.h"
#include <QString>
#include <QStringList>
#include <QTextStream>
@ -51,33 +53,13 @@ const std::vector<QDateTime>& RifColumnBasedAsciiParser::timeSteps() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double> RifColumnBasedAsciiParser::columnValues(size_t columnIndex) const
const std::vector<double>& RifColumnBasedAsciiParser::columnValues(size_t columnIndex) const
{
if (m_data.m_values.size() <= columnIndex)
{
std::vector<double> dummy;
return dummy;
}
CVF_TIGHT_ASSERT(m_data.m_values.size() <= columnIndex);
return m_data.m_values[columnIndex];
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector< std::vector<double> >& RifColumnBasedAsciiParser::values() const
{
return m_data.m_values;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const size_t RifColumnBasedAsciiParser::columnCount() const
{
return m_data.m_values.size();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/FileInterface/RifColumnBasedAsciiParser.h
View File

@ -35,9 +35,7 @@ public:
const std::vector<QString>& headers() const;
const std::vector<QDateTime>& timeSteps() const;
const std::vector<double> columnValues(size_t columnIndex) const;
const std::vector<std::vector<double>>& values() const;
const size_t columnCount() const;
const std::vector<double>& columnValues(size_t columnIndex) const;
private:
void parseData(QString& data, QString dateFormat, QLocale decimalLocale, QString cellSeparator);