OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2086 Handle extended file name chars on Linux for eclipse cases and summary cases

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-02-02 14:18:09 +01:00
parent ba09906163
commit b0ca4f3199
16 changed files with 164 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/FileInterface/RifReaderEclipseRft.cpp
+7 -5
View File
@@ -21,6 +21,8 @@
#include "RiaLogging.h"
#include "RiaQDateTimeTools.h"
#include "RifStringTools.h"
#include "cafVecIjk.h"
#include "ert/ecl/ecl_rft_file.h"
@@ -28,7 +30,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderEclipseRft::RifReaderEclipseRft(const std::string& fileName):
RifReaderEclipseRft::RifReaderEclipseRft(const QString& fileName):
m_fileName(fileName), m_ecl_rft_file(nullptr)
{
}
@@ -45,15 +47,15 @@ RifReaderEclipseRft::~RifReaderEclipseRft()
//--------------------------------------------------------------------------------------------------
void RifReaderEclipseRft::open()
{
if (m_fileName.empty()) return;
if (m_fileName.isEmpty()) return;
RiaLogging::info(QString("Opening file '%1'").arg(m_fileName.c_str()));
RiaLogging::info(QString("Opening file '%1'").arg( m_fileName));
m_ecl_rft_file = ecl_rft_file_alloc_case(m_fileName.data());
m_ecl_rft_file = ecl_rft_file_alloc_case(RifStringTools::toNativeEncoded(m_fileName).data());
if (m_ecl_rft_file == NULL)
{
RiaLogging::warning(QString("Libecl could not find/open file '%'").arg(m_fileName.c_str()));
RiaLogging::warning(QString("Libecl could not find/open file '%'").arg( m_fileName));
return;
}