diff --git a/cfgs/usct-product b/cfgs/usct-product index aaa3591..30a2103 100644 --- a/cfgs/usct-product +++ b/cfgs/usct-product @@ -37,7 +37,8 @@ "ae": "", "ip": "", "name": "", - "port": "" + "port": "", + "transferPath": "" }, "address": { "device": "eth0", diff --git a/cfgs/usct-product.json b/cfgs/usct-product.json index 47b16e6..33dbeab 100644 --- a/cfgs/usct-product.json +++ b/cfgs/usct-product.json @@ -60,7 +60,8 @@ "ae": "krad", "ip": "192.168.1.10", "localAE": "3D recon", - "port": "5003" + "port": "5003", + "transferPath": "/home/eq9/Tools/ReconTest/storage/Raw" }, "mpps": { "open": false, @@ -115,4 +116,4 @@ "patientlist": { "expire": "7" } -} \ No newline at end of file +} diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp index 8fef60f..1572b65 100644 --- a/src/json/jsonobject.cpp +++ b/src/json/jsonobject.cpp @@ -8,8 +8,14 @@ #include #include #include "json/cJSON.h" -const char* strProductFileName = "./cfgs/usct-product.json"; -const char* strProductFileNameDefault = "./cfgs/usct-product"; + +namespace +{ + const char* strProductFileName = "./cfgs/usct-product.json"; + const char* strProductFileNameDefault = "./cfgs/usct-product"; + const QString DEFAULT_RECON_TRANSFER_PATH = "/home/eq9/Tools/ReconTest/storage/Raw"; +} + JsonObject::JsonObject() { loadcfg(); @@ -88,6 +94,13 @@ void JsonObject::init() mReconHost.localAE = QString(getJsonString("recon", "localAE")); mReconHost.port = QString(getJsonString("recon", "port")); + QString path = QString(getJsonString("recon", "transferPath")); + mReconTransferPath = path.isEmpty() ? DEFAULT_RECON_TRANSFER_PATH : path; + if(mReconTransferPath.back() == '/') + { + mReconTransferPath.chop(1); + } + mMppsHost.ae = QString(getJsonString("mpps", "ae")); mMppsHost.ip = QString(getJsonString("mpps", "ip")); mMppsHost.localAE = QString(getJsonString("mpps", "localAE")); @@ -641,3 +654,8 @@ void JsonObject::setMppsOpen(bool aIsOpen) mMppsOpen = aIsOpen; setBool("mpps","open", aIsOpen, true); } + +QString JsonObject::getReconTransferPath() +{ + return mReconTransferPath; +} diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h index 6e2a07e..fb57655 100644 --- a/src/json/jsonobject.h +++ b/src/json/jsonobject.h @@ -124,6 +124,8 @@ public: int getOperationLogExpireDays(); int getPatientListExpireDays(); + QString getReconTransferPath(); + private: void setJsonString(const char* catergory, const char* stringName, const char* stringValue, bool save = true); @@ -157,7 +159,7 @@ private: QString mInstitutionAddr; QString mInterfaceName; QString mGateway; - + QString mReconTransferPath; QStringList mLockScreenTimeList; QStringList mProtocalList;