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

feat: Change quit move thread logic.

Browse Source
This commit is contained in:
sunwen
2025-06-11 16:47:18 +08:00
parent 206fd7b913
commit af9a734bf3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/src/PACS/Network/moveworker.cpp
View File

@@ -15,7 +15,7 @@ MoveWorker::MoveWorker(unsigned long ourPort, const std::string& ourTitle, QObje
MoveWorker::~MoveWorker()
{
mMoveStoreThread->quit();
mMoveStoreThread->terminate();
mMoveStoreThread->wait();
mMoveStoreThread->deleteLater();
return;
@@ -106,6 +106,10 @@ void MoveWorker::moveByStudyInstanceUID(const QString& studyInstanceUID)
{
emit notifyMoveDone(0, mStrOutputDirectory);
}
else
{
emit notifyMoveDone(1, "");
}
}
mScu->releaseAssociation();
}

3
src/src/PACS/Widget/importwidget.cpp
View File

@@ -81,7 +81,7 @@ ImportWidget::~ImportWidget()
if (mMoveWorkerThread != nullptr && !mMoveWorkerThread->isFinished())
{
mMoveWorkerThread->exit();
mMoveWorkerThread->terminate();
mMoveWorkerThread->wait();
delete mMoveWorkerThread;
mMoveWorkerThread = nullptr;
@@ -645,6 +645,7 @@ void ImportWidget::executeCMove(const QModelIndex &current)
return;
}
mMoveWorker->setPacsInfo(peerIP,peerPort,peerTitle);
mMoveWorker->setListenInfo(ourTitle, ourPort);
mMoveWorker->setOutputDirectory(QString::fromStdString(outDirectory));
QMetaObject::invokeMethod(mMoveWorker, "moveByStudyInstanceUID", Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(studyInstanceUID)));