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

#9630 Fix import of well data from SSIHUB

Browse Source
This commit is contained in:
Magne Sjaastad
2023-01-06 14:56:41 +01:00
committed by GitHub
parent fe181ed60e
commit f46516ac85
5 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ApplicationLibCode/FileInterface/RifJsonEncodeDecode.cpp
View File

@@ -19,6 +19,7 @@
#include "RifJsonEncodeDecode.h"
#include <QtCore/QFile>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QString>
@@ -35,6 +36,26 @@ QMap<QString, QVariant> JsonReader::decodeFile( QString filePath )
return Json::decode( byteArray );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QVariantList JsonReader::getVariantList( const QMap<QString, QVariant>& map )
{
// Assume a "root" key with a variant list
return map[JsonReader::rootKeyText()].toList();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString JsonReader::rootKeyText()
{
return "root";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString Json::encode( const QMap<QString, QVariant>& map, bool prettify )
{
QJsonDocument doc( QJsonObject::fromVariantMap( map ) );
@@ -43,14 +64,34 @@ QString Json::encode( const QMap<QString, QVariant>& map, bool prettify )
return doc.toJson( format );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QMap<QString, QVariant> Json::decode( const QString& jsonStr )
{
return Json::decode( jsonStr.toUtf8() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QMap<QString, QVariant> Json::decode( const QByteArray& byteArray )
{
return QJsonDocument::fromJson( byteArray ).object().toVariantMap();
auto document = QJsonDocument::fromJson( byteArray );
if ( document.isObject() ) return QJsonDocument::fromJson( byteArray ).object().toVariantMap();
// Return a variant map with "root" as key and a variant list if the document contains an array
if ( document.isArray() )
{
auto variantList = document.array().toVariantList();
QMap<QString, QVariant> map;
map[JsonReader::rootKeyText()] = variantList;
return map;
}
return {};
}
} // namespace ResInsightInternalJson

5
ApplicationLibCode/FileInterface/RifJsonEncodeDecode.h
View File

@@ -29,6 +29,11 @@ class JsonReader
{
public:
QMap<QString, QVariant> decodeFile( QString filePath );
// Get a variant list from a map
static QVariantList getVariantList( const QMap<QString, QVariant>& map );
static QString rootKeyText();
};
class Json