From cf9203fe0a39ea7478d444c2c826c3e8a5d953ce Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Thu, 30 Nov 2017 18:57:09 +0100 Subject: [PATCH] #2182 RFT: Fix path creation of RFT files --- .../ProjectDataModel/RimEclipseResultCase.cpp | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index 4095b1a1fe..84e9761bad 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -203,33 +203,14 @@ bool RimEclipseResultCase::importGridAndResultMetaData(bool showTimeStepFilter) m_flowDagSolverInterface = new RigFlowDiagSolverInterface(this); - QStringList fileSplitOnDot = caseFileName().split("."); - if (fileSplitOnDot.size() == 2) - { - QStringList fileSplitOnBackSlash = fileSplitOnDot[0].split("\\"); - if (fileSplitOnDot[0] != fileSplitOnBackSlash[0]) - { - m_caseName = fileSplitOnBackSlash.back(); - } - else - { - QStringList fileSplitOnSlash = fileSplitOnDot[0].split("/"); - m_caseName = fileSplitOnSlash.back(); - } + QFileInfo eclipseCaseFileInfo(caseFileName()); + QString rftFileName = eclipseCaseFileInfo.filePath().remove(eclipseCaseFileInfo.completeSuffix()) + "RFT"; + QFileInfo rftFileInfo(rftFileName); - QString rftFile = fileSplitOnDot[0] + ".RFT"; - std::string rftFileStdString = rftFile.toStdString(); - - std::ifstream inputStream(rftFileStdString.c_str()); - if (!inputStream.fail()) - { - RiaLogging::info(QString("File '%1' found, creating reader").arg(rftFileStdString.c_str())); - m_readerEclipseRft = new RifReaderEclipseRft(rftFileStdString); - } - else - { - RiaLogging::warning(QString("Could not find file '%1'").arg(rftFileStdString.c_str())); - } + if (rftFileInfo.exists()) + { + RiaLogging::info(QString("RFT file found")); + m_readerEclipseRft = new RifReaderEclipseRft(rftFileInfo.filePath().toStdString()); }