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

Merge branch '2018.01.01-patch' into dev. #2086

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-02-05 08:29:24 +01:00
parent 0db32df1c4 98a94c0525
commit c09dd0522b
17 changed files with 169 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
View File

@@ -21,6 +21,8 @@
#include "RigWellLogCurveData.h"
#include "RiaStringEncodingTools.h"
#include "RimWellLogCurve.h"
#include "well.hpp"
@@ -80,11 +82,8 @@ bool RigWellLogFile::open(const QString& fileName, QString* errorMessage)
try
{
int wellFormat = NRLib::Well::LAS;
#ifdef _WINDOWS
well = NRLib::Well::ReadWell(fileName.toStdString(), wellFormat);
#else
well = NRLib::Well::ReadWell(fileName.toUtf8().data(), wellFormat);
#endif
well = NRLib::Well::ReadWell(RiaStringEncodingTools::toNativeEncoded(fileName).data(), wellFormat);
if (!well)
{
return false;
@@ -152,7 +151,7 @@ void RigWellLogFile::close()
QString RigWellLogFile::wellName() const
{
CVF_ASSERT(m_wellLogFile);
return QString::fromStdString(m_wellLogFile->GetWellName());
return RiaStringEncodingTools::fromNativeEncoded(m_wellLogFile->GetWellName().data());
}
//--------------------------------------------------------------------------------------------------