Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

change unattenuated zone placeholder and offer method to grab JSON settings

Browse source
This commit is contained in:
Stephen Birarda 2014-06-25 14:16:24 -07:00
parent 6519d4028a
commit 4188a4eab1
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/settings/describe.json
View file

@ -5,7 +5,7 @@
"unattenuated-zone": { "unattenuated-zone": {
"label": "Unattenuated Zone", "label": "Unattenuated Zone",
"help": "Boxes for source and listener (corner x, corner y, corner z, size x, size y, size z, corner x, corner y, corner z, size x, size y, size z)", "help": "Boxes for source and listener (corner x, corner y, corner z, size x, size y, size z, corner x, corner y, corner z, size x, size y, size z)",
"placeholder": "0,0,0,20,20,20,50,50,50,10,10,10" "placeholder": "no zone"
} }
} }
} }

2
domain-server/src/DomainServer.cpp
View file

@ -363,7 +363,7 @@ void DomainServer::createStaticAssignmentsForType(Assignment::Type type, const Q
QString dashes = payloadKey.size() == 1 ? "-" : "--"; QString dashes = payloadKey.size() == 1 ? "-" : "--";
payloadStringList << QString("%1%2 %3").arg(dashes).arg(payloadKey).arg(jsonObject[payloadKey].toString()); payloadStringList << QString("%1%2 %3").arg(dashes).arg(payloadKey).arg(jsonObject[payloadKey].toString());
} }
configAssignment->setPayload(payloadStringList.join(' ').toUtf8()); configAssignment->setPayload(payloadStringList.join(' ').toUtf8());
addStaticAssignmentToAssignmentHash(configAssignment); addStaticAssignmentToAssignmentHash(configAssignment);

6
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -103,11 +103,15 @@ void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
} }
} }
QByteArray DomainServerSettingsManager::getJSONSettingsMap() const {
return QJsonDocument::fromVariant(_settingsMap).toJson();
}
void DomainServerSettingsManager::persistToFile() { void DomainServerSettingsManager::persistToFile() {
QFile settingsFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH); QFile settingsFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH);
if (settingsFile.open(QIODevice::WriteOnly)) { if (settingsFile.open(QIODevice::WriteOnly)) {
settingsFile.write(QJsonDocument::fromVariant(_settingsMap).toJson()); settingsFile.write(getJSONSettingsMap());
} else { } else {
qCritical("Could not write to JSON settings file. Unable to persist settings."); qCritical("Could not write to JSON settings file. Unable to persist settings.");
} }

2
domain-server/src/DomainServerSettingsManager.h
View file

@ -21,6 +21,8 @@ class DomainServerSettingsManager : public QObject, HTTPRequestHandler {
public: public:
DomainServerSettingsManager(); DomainServerSettingsManager();
bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url); bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url);
QByteArray getJSONSettingsMap() const;
private: private:
void recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, QVariantMap& settingsVariant, void recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, QVariantMap& settingsVariant,
QJsonObject descriptionObject); QJsonObject descriptionObject);