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

#2018 CSV import. More date formats. Bugfix in import dialog

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-24 13:00:30 +01:00
parent 28db4c6e22
commit 3872be8f35
6 changed files with 99 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@@ -26,6 +26,8 @@
#include "RiaStdStringTools.h"
#include "RiaQDateTimeTools.h"
#include "../Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "cvfAssert.h"
#include <QString>
@@ -241,11 +243,15 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
}
else if (col.dataType == ColumnInfo::DATETIME)
{
QDateTime dt = tryParseDateTime(colData.toStdString(), parseOptions.dateTimeFormat());
if (!dt.isValid())
QDateTime dt;
dt = tryParseDateTime(colData.toStdString(), parseOptions.dateTimeFormat);
if (!dt.isValid() && !parseOptions.useCustomDateTimeFormat)
{
// Try to match date format only
dt = tryParseDateTime(colData.toStdString(), parseOptions.dateFormat);
}
if (!dt.isValid()) throw 0;
col.dateTimeValues.push_back(dt);
}