OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-15 01:42:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#3320 Observed data import. Line based CSV import

Browse Source
This commit is contained in:
Bjørn Erik Jensen committed 2018-09-19 13:03:21 +02:00
1 parent c1c87a0370
commit ce59e8a0d0
12 files changed
+311 -66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h
+16 -2
View File
@@ -60,7 +60,7 @@ public:
size_t itemCount() const;
public:
static Column createColumnInfoFromRsmData(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& adr);
static Column createColumnInfoFromRsmData(const std::string& quantity, const std::string& unit, const RifEclipseSummaryAddress& addr);
static Column createColumnInfoFromCsvData(const RifEclipseSummaryAddress& addr, const std::string& unit);
RifEclipseSummaryAddress summaryAddress;
@@ -71,7 +71,10 @@ public:
// Data containers
std::vector<double> values;
std::vector<std::string > textValues;
std::vector<QDateTime> dateTimeValues;
//std::vector<QDateTime> dateTimeValues;
std::vector<time_t> dateTimeValues;
std::vector<QDateTime> qDateTimeValues() const;
};
@@ -89,8 +92,17 @@ public:
const std::vector<Column>& columnInfos)
: m_origin(origin),
m_startDate(startDate),
m_dateTimeColumnIndex(-1),
m_columnInfos(columnInfos)
{
for (size_t i = 0; i < columnInfos.size(); i++)
{
if (columnInfos[i].dataType == Column::DATETIME)
{
m_dateTimeColumnIndex = (int)i;
break;
}
}
}
std::string origin() const
@@ -113,11 +125,13 @@ public:
return m_columnInfos;
}
int dateTimeColumnIndex() const;
QDateTime findFirstDate() const;
private:
std::string m_origin;
std::string m_startDate;
int m_dateTimeColumnIndex;
std::vector<Column> m_columnInfos;
};