lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move common Qt utility functions & JSON I/O together in a single place

Browse Source
This commit is contained in:
baldurk
2016-11-09 13:23:53 +01:00
parent 66298ea1ce
commit bb2f3a205c
16 changed files with 460 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/PersistantConfig.cpp
+9 -46
View File
@@ -25,9 +25,12 @@
#include "PersistantConfig.h"
#include <QDebug>
#include <QDir>
#include <QJsonDocument>
#include "QRDUtils.h"
#include "renderdoc_replay.h"
#define JSON_ID "rdocConfigData"
#define JSON_VER 1
// helper templates to convert some more complex types to/from appropriate variants
template <typename variantType, typename origType>
variantType convertToVariant(const origType &val)
@@ -93,29 +96,12 @@ bool PersistantConfig::Deserialize(QString filename)
if(f.open(QIODevice::ReadOnly | QIODevice::Text))
{
QByteArray json = f.readAll();
QVariantMap values;
if(json.isEmpty())
{
qCritical() << "Read invalid empty JSON data from file " << f.errorString();
bool success = LoadFromJSON(values, f, JSON_ID, JSON_VER);
if(!success)
return false;
}
QJsonDocument doc = QJsonDocument::fromJson(json);
if(doc.isEmpty() || doc.isNull())
{
qCritical() << "Failed to convert file to JSON document";
return false;
}
QVariantMap values = doc.toVariant().toMap();
if(values.isEmpty() || !values.contains("renderdocConfigData"))
{
qCritical() << "Converted config data is invalid or unrecognised";
return false;
}
applyValues(values);
@@ -131,32 +117,9 @@ bool PersistantConfig::Serialize(QString filename)
{
QVariantMap values = storeValues();
// marker that this is indeed a valid config to load from
values["renderdocConfigData"] = 1;
QFile f(filename);
if(f.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text))
{
QJsonDocument doc = QJsonDocument::fromVariant(values);
if(doc.isEmpty() || doc.isNull())
{
qCritical() << "Failed to convert config data to JSON document";
return false;
}
QByteArray jsontext = doc.toJson(QJsonDocument::Indented);
qint64 ret = f.write(jsontext);
if(ret != jsontext.size())
{
qCritical() << "Failed to write JSON data to file: " << ret << " " << f.errorString();
return false;
}
return true;
}
return SaveToJSON(values, f, JSON_ID, JSON_VER);
qWarning() << "Couldn't write to " << filename << " " << f.errorString();