sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add start scan process without recon connect while configured.

Browse Source
This commit is contained in:
sunwen
2024-07-05 11:09:16 +08:00
parent 4ae2193ef7
commit 679cc2ec18
7 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cfgs/usct-product.json
View File

@@ -28,7 +28,7 @@
"AnonymousMode": false "AnonymousMode": false
}, },
"protocol": { "protocol": {
"default": "1", "default": "0",
"lists": "0;1;2;3" "lists": "0;1;2;3"
}, },
"storagepolicy": { "storagepolicy": {
@@ -45,36 +45,37 @@
"usercode": "" "usercode": ""
}, },
"worklist": { "worklist": {
"ae": "DCM4CHEE", "ae": "WORKLIST",
"ip": "192.168.1.10", "ip": "192.168.1.6",
"localAE": "gui", "localAE": "gui2",
"port": "11112" "port": "11112"
}, },
"pacs": { "pacs": {
"ae": "ORTHANC", "ae": "DCM4CHEE",
"ip": "192.168.1.10", "ip": "192.168.1.6",
"localAE": "Radiant", "localAE": "server9D",
"port": "4242" "port": "11112"
}, },
"recon": { "recon": {
"ae": "krad", "ae": "server9D",
"ip": "192.168.1.10", "ip": "192.168.1.153",
"localAE": "3D recon", "localAE": "3D recon",
"port": "5003", "port": "5003",
"transferPath": "/home/eq9/Tools/ReconTest/storage/Raw" "transferPath": "",
"scancanwithoutrecon": false
}, },
"mpps": { "mpps": {
"open": false, "open": true,
"ae": "mpps", "ae": "WORKLIST",
"ip": "192.168.1.15", "ip": "192.168.1.6",
"localAE": "Mpps Server", "localAE": "gui2",
"port": "5002" "port": "11112"
}, },
"address": { "address": {
"device": "eth0", "device": "eth0",
"Dhcp": true, "Dhcp": false,
"ip": "192.168.1.197", "ip": "192.168.1.14",
"gateway": "192.168.1.197", "gateway": "0.0.0.0",
"mask": "255.255.255.0", "mask": "255.255.255.0",
"ae": "MOON", "ae": "MOON",
"name": "daq", "name": "daq",

4
src/UserOperationLogForm.cpp
View File

@@ -22,7 +22,9 @@ QString dateToFileName(QString date)
return QString("./log/UserOperationLog/") + date + QString("-op.log"); return QString("./log/UserOperationLog/") + date + QString("-op.log");
} }
UserOperationLogForm::UserOperationLogForm(QWidget* parent) { UserOperationLogForm::UserOperationLogForm(QWidget* parent)
: QWidget (parent)
{
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
QWidget* header = new QWidget(this); QWidget* header = new QWidget(this);
QHBoxLayout* headerLayout = new QHBoxLayout(header); QHBoxLayout* headerLayout = new QHBoxLayout(header);

7
src/device/DeviceManager.cpp
View File

@@ -1292,9 +1292,10 @@ void DeviceManager::updateReconConnectionState(bool aIsConnected)
void DeviceManager::startScanProcess() void DeviceManager::startScanProcess()
{ {
LOG_SYS_OPERATION("Start scan process."); LOG_SYS_OPERATION("Start scan process.");
if( !UsctStateManager::getInstance()->getState(ReconConnectionState) || if( !JsonObject::Instance()->getScanCanWithoutRecon() &&
!UsctStateManager::getInstance()->getState(ReconState) || (!UsctStateManager::getInstance()->getState(ReconConnectionState) ||
!UsctStateManager::getInstance()->getState(ReconDBState)) !UsctStateManager::getInstance()->getState(ReconState) ||
!UsctStateManager::getInstance()->getState(ReconDBState)))
{ {
QString errorMessage = tr("Recon error, can't start scan process"); QString errorMessage = tr("Recon error, can't start scan process");
LOG_SYS_OPERATION(errorMessage) LOG_SYS_OPERATION(errorMessage)

6
src/json/jsonobject.cpp
View File

@@ -100,6 +100,7 @@ void JsonObject::init()
{ {
mReconTransferPath.chop(1); mReconTransferPath.chop(1);
} }
mScanCanWithoutRecon = getBool("recon", "scancanwithoutrecon");
mMppsHost.ae = QString(getJsonString("mpps", "ae")); mMppsHost.ae = QString(getJsonString("mpps", "ae"));
mMppsHost.ip = QString(getJsonString("mpps", "ip")); mMppsHost.ip = QString(getJsonString("mpps", "ip"));
@@ -659,3 +660,8 @@ QString JsonObject::getReconTransferPath()
{ {
return mReconTransferPath; return mReconTransferPath;
} }
bool JsonObject::getScanCanWithoutRecon()
{
return mScanCanWithoutRecon;
}

3
src/json/jsonobject.h
View File

@@ -126,6 +126,8 @@ public:
QString getReconTransferPath(); QString getReconTransferPath();
bool getScanCanWithoutRecon();
private: private:
void setJsonString(const char* catergory, const char* stringName, const char* stringValue, bool save = true); void setJsonString(const char* catergory, const char* stringName, const char* stringValue, bool save = true);
@@ -184,6 +186,7 @@ private:
bool mAnonymousMode; bool mAnonymousMode;
bool mScreenSaverMode; bool mScreenSaverMode;
bool mMppsOpen; bool mMppsOpen;
bool mScanCanWithoutRecon;

7
src/log/LogFileTableModel.cpp
View File

@@ -13,10 +13,13 @@ void LogFileTableModel::setFileName(QString fileName) {
qDebug()<<fileName; qDebug()<<fileName;
QFile f; QFile f;
f.setFileName(fileName); f.setFileName(fileName);
if (!f.exists()) return; if (!f.exists())
{
endResetModel();
return;
}
if(f.open(QFile::OpenModeFlag::ReadOnly | QFile::OpenModeFlag::Text)) if(f.open(QFile::OpenModeFlag::ReadOnly | QFile::OpenModeFlag::Text))
{ {
QTextStream in(&f); QTextStream in(&f);
while(!in.atEnd()){ while(!in.atEnd()){
logdata.push_back(in.readLine().split("\t")); logdata.push_back(in.readLine().split("\t"));

4
src/main.cpp
View File

@@ -6,6 +6,7 @@
#include <QFontDatabase> #include <QFontDatabase>
#include <QDebug> #include <QDebug>
#include <QThread> #include <QThread>
#include <QProcess>
#include <QTimer> #include <QTimer>
#include "log/UserOperationLog.h" #include "log/UserOperationLog.h"
#include <QTranslator> #include <QTranslator>
@@ -46,7 +47,7 @@ int main(int argc, char* argv[])
#endif // CUTE_STYLE #endif // CUTE_STYLE
//qputenv("QT_LOGGING_RULES", QByteArray("qt.virtualkeyboard=true")); //qputenv("QT_LOGGING_RULES", QByteArray("qt.virtualkeyboard=true"));
QProcess::startDetached("./backup.sh");
const char* dicomDictPath = "/usr/local/share/dcmtk/dicom.dic"; const char* dicomDictPath = "/usr/local/share/dcmtk/dicom.dic";
setenv("DCMDICTPATH", dicomDictPath, 1); setenv("DCMDICTPATH", dicomDictPath, 1);
UsctApplication a(argc, argv); UsctApplication a(argc, argv);
@@ -95,6 +96,7 @@ int main(int argc, char* argv[])
MainWindow w; MainWindow w;
DialogManager::Default()->init(&w); DialogManager::Default()->init(&w);
UserOperationLog::Default()->init(); UserOperationLog::Default()->init();
LOG_USER_OPERATION("GUI Started");
SystemOperationLog::getInstance(); SystemOperationLog::getInstance();
QObject::connect(TouchScreenSignalSender::getInstance(), SIGNAL(touchScreen()), Locker::getInstance(), SLOT(refreshTimer())); QObject::connect(TouchScreenSignalSender::getInstance(), SIGNAL(touchScreen()), Locker::getInstance(), SLOT(refreshTimer()));