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

#3024 Observed summary data. Fix summary address parse failures

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-06-08 10:22:01 +02:00
parent 86ab696fd6
commit aa08735143
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@ -672,7 +672,7 @@ std::string RifEclipseSummaryAddress::formatUiTextIJK() const
//--------------------------------------------------------------------------------------------------
std::tuple<int, int, int> RifEclipseSummaryAddress::ijkTupleFromUiText(const std::string &s)
{
QStringList ijk = QString().fromStdString(s).trimmed().split(QRegExp("[ ,.:;]"));
QStringList ijk = QString().fromStdString(s).trimmed().split(QRegExp("[,]"));
if (ijk.size() != 3) return std::make_tuple(-1, -1, -1);
@ -695,12 +695,12 @@ std::string RifEclipseSummaryAddress::formatUiTextRegionToRegion() const
//--------------------------------------------------------------------------------------------------
std::pair<int, int> RifEclipseSummaryAddress::regionToRegionPairFromUiText(const std::string &s)
{
auto sep = s.find("->");
CVF_ASSERT(sep != std::string::npos );
auto textReg = s.substr(0, sep);
auto textReg2 = s.substr(sep + 2);
return std::make_pair(RiaStdStringTools::toInt(textReg), RiaStdStringTools::toInt(textReg2));
QStringList r2r = QString().fromStdString(s).trimmed().split(QRegExp("[-]"));
if (r2r.size() != 2) return std::make_pair(-1, -1);
return std::make_pair(RiaStdStringTools::toInt(r2r[0].trimmed().toStdString()),
RiaStdStringTools::toInt(r2r[1].trimmed().toStdString()));
}
//--------------------------------------------------------------------------------------------------