From 679cc2ec18876887d390f8781662a1f482a8de6b Mon Sep 17 00:00:00 2001 From: sunwen Date: Fri, 5 Jul 2024 11:09:16 +0800 Subject: [PATCH] feat: Add start scan process without recon connect while configured. --- cfgs/usct-product.json | 39 ++++++++++++++++++----------------- src/UserOperationLogForm.cpp | 4 +++- src/device/DeviceManager.cpp | 7 ++++--- src/json/jsonobject.cpp | 6 ++++++ src/json/jsonobject.h | 3 +++ src/log/LogFileTableModel.cpp | 7 +++++-- src/main.cpp | 4 +++- 7 files changed, 44 insertions(+), 26 deletions(-) diff --git a/cfgs/usct-product.json b/cfgs/usct-product.json index 33dbeab..597da3b 100644 --- a/cfgs/usct-product.json +++ b/cfgs/usct-product.json @@ -28,7 +28,7 @@ "AnonymousMode": false }, "protocol": { - "default": "1", + "default": "0", "lists": "0;1;2;3" }, "storagepolicy": { @@ -45,36 +45,37 @@ "usercode": "" }, "worklist": { - "ae": "DCM4CHEE", - "ip": "192.168.1.10", - "localAE": "gui", + "ae": "WORKLIST", + "ip": "192.168.1.6", + "localAE": "gui2", "port": "11112" }, "pacs": { - "ae": "ORTHANC", - "ip": "192.168.1.10", - "localAE": "Radiant", - "port": "4242" + "ae": "DCM4CHEE", + "ip": "192.168.1.6", + "localAE": "server9D", + "port": "11112" }, "recon": { - "ae": "krad", - "ip": "192.168.1.10", + "ae": "server9D", + "ip": "192.168.1.153", "localAE": "3D recon", "port": "5003", - "transferPath": "/home/eq9/Tools/ReconTest/storage/Raw" + "transferPath": "", + "scancanwithoutrecon": false }, "mpps": { - "open": false, - "ae": "mpps", - "ip": "192.168.1.15", - "localAE": "Mpps Server", - "port": "5002" + "open": true, + "ae": "WORKLIST", + "ip": "192.168.1.6", + "localAE": "gui2", + "port": "11112" }, "address": { "device": "eth0", - "Dhcp": true, - "ip": "192.168.1.197", - "gateway": "192.168.1.197", + "Dhcp": false, + "ip": "192.168.1.14", + "gateway": "0.0.0.0", "mask": "255.255.255.0", "ae": "MOON", "name": "daq", diff --git a/src/UserOperationLogForm.cpp b/src/UserOperationLogForm.cpp index 79829dd..7db35a9 100644 --- a/src/UserOperationLogForm.cpp +++ b/src/UserOperationLogForm.cpp @@ -22,7 +22,9 @@ QString dateToFileName(QString date) return QString("./log/UserOperationLog/") + date + QString("-op.log"); } -UserOperationLogForm::UserOperationLogForm(QWidget* parent) { +UserOperationLogForm::UserOperationLogForm(QWidget* parent) + : QWidget (parent) +{ layout = new QVBoxLayout(this); QWidget* header = new QWidget(this); QHBoxLayout* headerLayout = new QHBoxLayout(header); diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index b1f8b0a..0710bf6 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -1292,9 +1292,10 @@ void DeviceManager::updateReconConnectionState(bool aIsConnected) void DeviceManager::startScanProcess() { LOG_SYS_OPERATION("Start scan process."); - if( !UsctStateManager::getInstance()->getState(ReconConnectionState) || - !UsctStateManager::getInstance()->getState(ReconState) || - !UsctStateManager::getInstance()->getState(ReconDBState)) + if( !JsonObject::Instance()->getScanCanWithoutRecon() && + (!UsctStateManager::getInstance()->getState(ReconConnectionState) || + !UsctStateManager::getInstance()->getState(ReconState) || + !UsctStateManager::getInstance()->getState(ReconDBState))) { QString errorMessage = tr("Recon error, can't start scan process"); LOG_SYS_OPERATION(errorMessage) diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp index 027f361..e77180a 100644 --- a/src/json/jsonobject.cpp +++ b/src/json/jsonobject.cpp @@ -100,6 +100,7 @@ void JsonObject::init() { mReconTransferPath.chop(1); } + mScanCanWithoutRecon = getBool("recon", "scancanwithoutrecon"); mMppsHost.ae = QString(getJsonString("mpps", "ae")); mMppsHost.ip = QString(getJsonString("mpps", "ip")); @@ -659,3 +660,8 @@ QString JsonObject::getReconTransferPath() { return mReconTransferPath; } + +bool JsonObject::getScanCanWithoutRecon() +{ + return mScanCanWithoutRecon; +} diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h index fb57655..13f387a 100644 --- a/src/json/jsonobject.h +++ b/src/json/jsonobject.h @@ -126,6 +126,8 @@ public: QString getReconTransferPath(); + bool getScanCanWithoutRecon(); + private: void setJsonString(const char* catergory, const char* stringName, const char* stringValue, bool save = true); @@ -184,6 +186,7 @@ private: bool mAnonymousMode; bool mScreenSaverMode; bool mMppsOpen; + bool mScanCanWithoutRecon; diff --git a/src/log/LogFileTableModel.cpp b/src/log/LogFileTableModel.cpp index 7220043..604ee56 100644 --- a/src/log/LogFileTableModel.cpp +++ b/src/log/LogFileTableModel.cpp @@ -13,10 +13,13 @@ void LogFileTableModel::setFileName(QString fileName) { qDebug()< #include #include +#include #include #include "log/UserOperationLog.h" #include @@ -46,7 +47,7 @@ int main(int argc, char* argv[]) #endif // CUTE_STYLE //qputenv("QT_LOGGING_RULES", QByteArray("qt.virtualkeyboard=true")); - + QProcess::startDetached("./backup.sh"); const char* dicomDictPath = "/usr/local/share/dcmtk/dicom.dic"; setenv("DCMDICTPATH", dicomDictPath, 1); UsctApplication a(argc, argv); @@ -95,6 +96,7 @@ int main(int argc, char* argv[]) MainWindow w; DialogManager::Default()->init(&w); UserOperationLog::Default()->init(); + LOG_USER_OPERATION("GUI Started"); SystemOperationLog::getInstance(); QObject::connect(TouchScreenSignalSender::getInstance(), SIGNAL(touchScreen()), Locker::getInstance(), SLOT(refreshTimer()));