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

#1842 RFT Plot. First visible RFT curve

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-10-03 13:54:07 +02:00
parent 947d31bfcc
commit d090f8ac2d
6 changed files with 130 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Application/Tools/RiaDateStringParser.cpp
View File

@@ -19,7 +19,6 @@
#include "RiaDateStringParser.h"
#include <algorithm>
#include <vector>
const std::string MONTH_NAMES[] =
{
@@ -40,14 +39,15 @@ const std::string MONTH_NAMES[] =
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QDate RiaDateStringParser::parseDateString(const std::string& dateString)
QDateTime RiaDateStringParser::parseDateString(const QString& dateString)
{
int year, month, day;
std::string s = dateString.toStdString();
bool parsedOk =
tryParseYearFirst(dateString, year, month, day) ||
tryParseDayFirst(dateString, year, month, day);
tryParseYearFirst(s, year, month, day) ||
tryParseDayFirst(s, year, month, day);
return parsedOk ? QDate(year, month, day) : QDate();
return parsedOk ? QDateTime(QDate(year, month, day)) : QDateTime();
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/Application/Tools/RiaDateStringParser.h
View File

@@ -18,8 +18,9 @@
#pragma once
#include <string>
#include <QString>
#include <QDate>
#include <QDateTime>
//==================================================================================================
//
@@ -29,7 +30,7 @@
class RiaDateStringParser
{
public:
static QDate parseDateString(const std::string& dateString);
static QDateTime parseDateString(const QString& dateString);
private:
static bool tryParseYearFirst(const std::string& s, int& year, int& month, int& day);