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

Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser

Browse Source
This commit is contained in:
Magne Sjaastad
2016-06-06 10:43:36 +02:00
parent 4fd8e2503c
commit 7742fbe325
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/CMakeLists.txt
View File

@@ -290,7 +290,6 @@ if(RESINSIGHT_ENABLE_COTIRE)
set_source_files_properties (${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc PROPERTIES COTIRE_EXCLUDED TRUE)
# TODO: Revisit why opm-parser is not working
# Must namespace JsonReader in RifJsonEncodeDecode to guard agains crash with JSON in opm-parser
set_source_files_properties (${ResInsight_SOURCE_DIR}/ApplicationCode/UnitTests/opm-parser-Test.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
set_target_properties(ResInsight PROPERTIES

3
ApplicationCode/FileInterface/RifJsonEncodeDecode.cpp
View File

@@ -26,6 +26,7 @@
#include <QtScript/QScriptEngine>
#include <QtScript/QScriptValueIterator>
namespace ResInsightInternalJson {
QMap<QString, QVariant> JsonReader::decodeFile(QString filePath)
{
@@ -141,3 +142,5 @@ QList<QVariant> Json::decodeInnerToList(QScriptValue arrayValue)
}
return list;
}
} // end ResInsightInternalJson

6
ApplicationCode/FileInterface/RifJsonEncodeDecode.h
View File

@@ -36,6 +36,9 @@
class QScriptEngine;
// Encapsulate the JSON code in a namespace to avoid issues with JSON classes used in opm-parser
namespace ResInsightInternalJson {
class JsonReader
{
public:
@@ -58,3 +61,6 @@ private:
QMap<QString, QVariant> decodeInner(QScriptValue object);
QList<QVariant> decodeInnerToList(QScriptValue arrayValue);
};
} // end ResInsightInternalJson

2
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@@ -210,7 +210,7 @@ bool RimWellPath::readWellPathFile(QString* errorMessage, RifWellPathAsciiFileRe
void RimWellPath::readJsonWellPathFile()
{
RigWellPath* wellPathGeom = new RigWellPath();
JsonReader jsonReader;
ResInsightInternalJson::JsonReader jsonReader;
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile(filepath);
// General well info

4
ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp
View File

@@ -354,7 +354,7 @@ void RiuWellImportWizard::updateFieldsModel()
if (QFile::exists(fileName))
{
JsonReader jsonReader;
ResInsightInternalJson::JsonReader jsonReader;
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile(fileName);
QStringList regions;
@@ -581,7 +581,7 @@ void RiuWellImportWizard::parseWellsResponse(RimOilFieldEntry* oilFieldEntry)
if (QFile::exists(oilFieldEntry->wellsFilePath))
{
JsonReader jsonReader;
ResInsightInternalJson::JsonReader jsonReader;
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile(oilFieldEntry->wellsFilePath);
QMapIterator<QString, QVariant> it(jsonMap);