From 4188a4eab1965b9d480b142c6d994bf48d293ad8 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 25 Jun 2014 14:16:24 -0700
Subject: [PATCH] change unattenuated zone placeholder and offer method to grab
 JSON settings

---
 domain-server/resources/web/settings/describe.json | 2 +-
 domain-server/src/DomainServer.cpp                 | 2 +-
 domain-server/src/DomainServerSettingsManager.cpp  | 6 +++++-
 domain-server/src/DomainServerSettingsManager.h    | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/domain-server/resources/web/settings/describe.json b/domain-server/resources/web/settings/describe.json
index b111018a30..f4ac017c87 100644
--- a/domain-server/resources/web/settings/describe.json
+++ b/domain-server/resources/web/settings/describe.json
@@ -5,7 +5,7 @@
       "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)",
-        "placeholder": "0,0,0,20,20,20,50,50,50,10,10,10"
+        "placeholder": "no zone"
       }
     }
   }
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 13245b2fb9..fcfe1ff582 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -363,7 +363,7 @@ void DomainServer::createStaticAssignmentsForType(Assignment::Type type, const Q
                 QString dashes = payloadKey.size() == 1 ? "-" : "--";
                 payloadStringList << QString("%1%2 %3").arg(dashes).arg(payloadKey).arg(jsonObject[payloadKey].toString());
             }
-
+            
             configAssignment->setPayload(payloadStringList.join(' ').toUtf8());
 
             addStaticAssignmentToAssignmentHash(configAssignment);
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index b40fbfe2f6..fabd26c8e0 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -103,11 +103,15 @@ void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
     }
 }
 
+QByteArray DomainServerSettingsManager::getJSONSettingsMap() const {
+    return QJsonDocument::fromVariant(_settingsMap).toJson();
+}
+
 void DomainServerSettingsManager::persistToFile() {
     QFile settingsFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH);
     
     if (settingsFile.open(QIODevice::WriteOnly)) {
-        settingsFile.write(QJsonDocument::fromVariant(_settingsMap).toJson());
+        settingsFile.write(getJSONSettingsMap());
     } else {
         qCritical("Could not write to JSON settings file. Unable to persist settings.");
     }
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index bb2cb17f81..8b80cad280 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -21,6 +21,8 @@ class DomainServerSettingsManager : public QObject, HTTPRequestHandler {
 public:
     DomainServerSettingsManager();
     bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url);
+    
+    QByteArray getJSONSettingsMap() const;
 private:
     void recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, QVariantMap& settingsVariant,
                                                QJsonObject descriptionObject);