diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp
index 97d6aa7..af98f38 100644
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -126,8 +126,6 @@ void DeviceManager::initDevice()
mFullScanAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_FULLSCAN, this, "responseFullScan(const QString&)", this);
mStopScanAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_STOP, this, "responseStopScan(const QString&)", this);
mPreviewScanAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_PREVIEW, this, "responsePreviewScan(const QString&)", this);
- mTransferAction = new DmsSyncAction(USRV_XFR, ACT_XFR_START, this, "responseTransfer(const QString&)", this);
- mGetTransferProgressAction = new DmsSyncAction(USRV_XFR, ACT_XFR_PROGRESS_PASSIVE, this, "responseGetTransferProgress(const QString&)", this);
mCEScanAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_CE, this, "responseCEScan(const QString&)", this);
mGetCEStatusAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_CE_STATUS, this, "responseGetCEStatus(const QString&)", this);
mSetSimulatorModeAction = new DmsSyncAction(USRV_SCAN, ACT_SCAN_SIMULATOR, this, "responseSetSimulatorMode(const QString&)", this);
@@ -140,7 +138,6 @@ void DeviceManager::initDevice()
//Async action
mGetScanProgressAction = new DmsAsyncAction(USRV_SCAN, ACT_SCAN_PROGRESS_PASSIVE, this,"responseGetScanProgress(const QString&)", this);
mGetDeviceTemperatureAction = new DmsAsyncAction(USRV_SCAN, ACT_SCAN_TEMP, this, "responseGetDeviceTemperature(const QString&)", this);
- mStopTransferAction = new DmsAsyncAction(USRV_XFR, ACT_XFR_STOP, this, "responseStopTransfer(const QString&)", this);
mShutDownAction = new DmsAsyncAction(USRV_CONTROL, ACT_CTL_PWRDOWN, this, "responseShutDown(const QString&)", this);
mShutDownAction->setTimeoutInterval(SHUT_DOWN_TIMEOUT);
mPumpControlAction = new DmsAsyncAction(USRV_CONTROL, ACT_CTL_PUMP, this, "responsePumpControl(const QString&)", this);
@@ -434,7 +431,10 @@ void DeviceManager::prepareFinishScan(bool isNormalFinish, const QString& aReaso
insertScanRecord();
}
- startTransfer();
+ if(ReconManager::getInstance()->isConnected())
+ {
+ startCreateReconRecord();
+ }
if(isCompleteNotify)
{
@@ -467,11 +467,6 @@ void DeviceManager::prepareFinishInitialize()
void DeviceManager::stopFullScan()
{
-// DeviceStatus inf = getDeviceStatus();
-// if (inf != DeviceStatus::Scanning)
-// {
-// return;
-// }
DmsSyncActionResult result = mStopScanAction->execute();
if(!result.mIsSucessful)
{
@@ -633,8 +628,6 @@ void DeviceManager::timerEvent(QTimerEvent* event)
getDeviceTemperature();
return QObject::timerEvent(event);
}
-
-
}
void DeviceManager::emitErrorCallback(const QString& msg)
@@ -702,6 +695,7 @@ void DeviceManager::processReceiveDMSInfoResult(int aServerID, int aActionID, co
break;
case ACT_SCAN_IMGQUALITI:
emit responseCheckDataQuality(aContents);
+ break;
default:
break;
}
@@ -716,23 +710,6 @@ void DeviceManager::processReceiveDMSInfoResult(int aServerID, int aActionID, co
break;
}
break;
- case USRV_XFR :
- switch(aActionID)
- {
- case ACT_XFR_START :
- emit responseTransfer(aContents);
- break;
- case ACT_XFR_STOP :
- emit responseStopTransfer(aContents);
- break;
- case ACT_XFR_PROGRESS_PASSIVE :
- emit responseGetTransferProgress(aContents);
- break;
- case ACT_XFR_PROGRESS_ACTIVE :
- processTransferProgress(aContents);
- break;
- }
- break;
case USRV_INFOCFG:
switch(aActionID)
{
@@ -933,13 +910,6 @@ void DeviceManager::getScanProcess()
void DeviceManager::shutdownDms()
{
- if(mIsTransfering)
- {
- QString msg = tr("Data is currently being transmitted, please shut down later.");
- THROW_ERROR(msg);
- return;
- }
-
if(!mShutDownAction->execute())
{
QString msg = tr("Shut down failed, please push emergency button to shutdown.");
@@ -1015,126 +985,6 @@ void DeviceManager::insertScanRecord()
}
}
-void DeviceManager::startTransfer()
-{
- if(mIsTransfering)
- {
- return;
- }
-
- QString sql = "SELECT ScanID FROM %1 WHERE State<200 ORDER BY ScanDateTime ASC LIMIT 1";
- QString table = "EScan";
- QVariant sqlResult = SQLHelper::queryValue(sql.arg(table));
- mIsTransferEmptyScan = true;
- if(sqlResult.isNull())
- {
- mIsTransferEmptyScan = false;
- table = "Scan";
- sqlResult = SQLHelper::queryValue(sql.arg(table));
- if(sqlResult.isNull())
- {
- return;
- }
- }
- QString scanID = sqlResult.toString();
- auto host = JsonObject::Instance()->getServer(JsonObject::RECON);
- mTransferAction->setSendData("{\"MD5\":1, \"dst\":\"" + host.ae + "@" + host.ip +":" + mReconTransferPath + "\", \"src\":\"" + scanID + "\",\"delete\":1,\"active report\":0}");
- DmsSyncActionResult result = mTransferAction->execute();
- if(!result.mIsSucessful)
- {
- QString msg = tr("Scan data transfer failed.");
- emitInfoCallback(msg, MessageLevel::Error);
- return;
- }
-
- QJsonObject jsonObj = toJsonObject(result.mData);
- int code = jsonObj["code"].toInt();
- if(code != 0)
- {
- mStopTransferAction->execute();
- QString msg = tr("Scan data transfer failed.");
- emitInfoCallback(msg, MessageLevel::Error);
- return;
- }
-
- mIsTransfering = true;
- mCurrentTransferMeasurementID = scanID;
-
- mCurrentTransferPatientID = mIsTransferEmptyScan ? "" : SQLHelper::queryValue(QString("SELECT PatientID FROM %1 WHERE ScanID = '%2'").arg(table).arg(scanID)).toString();
-
- sql = QString("UPDATE %1 set State = 100 where ScanID = '%2'")
- .arg(mIsTransferEmptyScan ? "EScan" : "Scan")
- .arg(mCurrentTransferMeasurementID);
- if(!SQLHelper::exec(sql))
- {
- QString msg = "DB Error. Code:G501";
- emitInfoCallback(msg, MessageLevel::Error);
- }
- else
- {
- updateTransferState();
- }
-}
-
-void DeviceManager::processTransferProgress(const QString& aProgress)
-{
- if(!mIsTransfering)
- {
- return;
- }
- QJsonObject jsonObj = toJsonObject(aProgress);
- int code = jsonObj["code"].toInt();
- QString msg = jsonObj["info"].toString();
-
- switch (code)
- {
- case 1:
- {
- break;
- }
- case 2:
- {
- QString sql = QString("UPDATE %1 set State = 200 where ScanID = '%2'")
- .arg(mIsTransferEmptyScan ? "EScan" : "Scan")
- .arg(mCurrentTransferMeasurementID);
- mIsTransfering = false;
- mTransferProgress = 0;
- mCurrentTransferMeasurementID.clear();
- if(!SQLHelper::exec(sql))
- {
- QString msg = "DB Error. Code:G502";
- emitInfoCallback(msg, MessageLevel::Error);
- break;
- }
- emitInfoCallback(tr("Scan data transfer Succeeded!"), MessageLevel::Sucess);
- updateTransferState();
- if(ReconManager::getInstance()->isConnected())
- {
- startCreateReconRecord();
- }
- startTransfer();
- break;
- }
- default:
- QString sql = QString("UPDATE %1 set State = 104 where ScanID = '%2'")
- .arg(mIsTransferEmptyScan ? "EScan" : "Scan")
- .arg(mCurrentTransferMeasurementID);
- mIsTransfering = false;
- mTransferProgress = 0;
- mCurrentTransferMeasurementID.clear();
- if(!SQLHelper::exec(sql))
- {
- QString msg = "DB Error. Code:G503";
- emitInfoCallback(msg, MessageLevel::Error);
- break;
- }
- QString message = tr("Scan data transfer failed.");
- emitInfoCallback(message, MessageLevel::Error);
- updateTransferState();
- break;
- }
-}
-
void DeviceManager::processReconCreateEmptyScan(bool aResult, const QString& aScanID, const QString& aMessage, bool aIsConnectSucceed)
{
if(aResult)
@@ -1205,7 +1055,7 @@ void DeviceManager::processReconQueryScanState(bool aResult, const QVariant& aSt
void DeviceManager::startCreateReconRecord()
{
- QString sql = "SELECT ScanID FROM EScan WHERE State < 300 And State >= 200 ORDER BY ScanDateTime ASC";
+ QString sql = "SELECT ScanID FROM EScan WHERE State < 300 ORDER BY ScanDateTime ASC";
auto result = SQLHelper::queryValues(sql);
for (const QVariant &variant : result)
{
@@ -1213,7 +1063,7 @@ void DeviceManager::startCreateReconRecord()
emit createEmptyScanToRecon(scanid, mReconTransferPath + "/" + scanid);
}
- sql = "SELECT ScanID, ReferenceID, PatientID, AccessionNumber, StudyUID, MPPSUID FROM Scan WHERE State < 300 And State >= 200 ORDER BY ScanDateTime ASC";
+ sql = "SELECT ScanID, ReferenceID, PatientID, AccessionNumber, StudyUID, MPPSUID FROM Scan WHERE State < 300 ORDER BY ScanDateTime ASC";
result = SQLHelper::queryValues(sql);
for (const QVariant &variant : result)
{
@@ -1227,7 +1077,6 @@ void DeviceManager::startCreateReconRecord()
emit createScanToRecon(scanID, mppsUID, referenceID, mReconTransferPath + "/" + scanID);
}
- startTransfer();
}
void DeviceManager::initEmptyScanMeasurementID()
@@ -1259,41 +1108,6 @@ void DeviceManager::updateReconState()
emit queryScanStatusToRecon(scanIDs);
}
-bool DeviceManager::updateTransferProgress()
-{
- if(!mIsTransfering)
- {
- return false;
- }
- mTransferProgress = 0;
- auto result = mGetTransferProgressAction->execute();
- QJsonObject jsonObj = toJsonObject(result.mData);
- if(jsonObj["code"].toInt() == 1 )
- {
- mTransferProgress = jsonObj["info"].toString().toInt();
- return true;
- }
-
- return false;
-}
-
-void DeviceManager::updateTransferState()
-{
- if(mIsTransferEmptyScan)
- {
- EventCenter::Default()->triggerEvent(EmptyScanDataStateUpdated, nullptr, nullptr);
- }
- else
- {
- emit transferStatusUpdated();
- }
-}
-
-int DeviceManager::getTransferProgress()
-{
- return mTransferProgress;
-}
-
bool DeviceManager::getCEStatus()
{
auto result = mGetCEStatusAction->execute();
diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h
index 6a31e0a..daf5ba4 100644
--- a/src/device/DeviceManager.h
+++ b/src/device/DeviceManager.h
@@ -67,8 +67,6 @@ public:
void emitErrorCallback(const QString& msg);
void emitInfoCallback(const QString& aMessage,const unsigned int aInfoType);
bool hasValidEmptyScan();
- bool updateTransferProgress();
- int getTransferProgress();
void prepareEmergencyReset();
public slots:
@@ -105,7 +103,6 @@ private:
void getAutoLocatePosition();
bool getCEStatus();
bool startCEScan();
- void startTransfer();
void initEmptyScanMeasurementID();
void controlDrainage(const QString& aCode);
void checkInitStatus();
@@ -122,7 +119,6 @@ private:
void processAlarm(const QString& aAlarm);
void processPreviewData(const QString& aPreviewData);
void processDeviceTemperature(const QString& aResponseTemperature);
- void processTransferProgress(const QString& aProgress);
void processShutDownDms(const QString& aResponse);
void processPumpResult(const QString& aResponse);
void processGetSoftwareVersion(const QString& aResponse);
@@ -130,8 +126,6 @@ private:
void insertEmptyScanRecord();
void insertScanRecord();
- void updateTransferState();
-
private slots:
//DMS
@@ -157,13 +151,10 @@ signals:
void responseStopScan(const QString& aResponse);
void responsePreviewScan(const QString& aResponse);
void responseGetSoftwareVersion(const QString& aSoftwareVersion);
- void responseTransfer(const QString& aResponse);
- void responseGetTransferProgress(const QString& aProgress);
void responseGetCEStatus(const QString& aProgress);
void responsePumpControl(const QString& aResponse);
void responseSetSimulatorMode(const QString& aResponse);
void responseSetHeartBeat(const QString& aResponese);
- void responseStopTransfer(const QString& aResponse);
void responseShutDown(const QString& aResponse);
void responseCheckInitStatus(const QString& aResponse);
void responseStartAutoLocate(const QString& aResponse);
@@ -180,7 +171,6 @@ signals:
//GUI
void initializeFinished();
void initializeProgress(const QString& aProgress);
- void transferStatusUpdated();
void startPreviewScanResult(bool aIsSucessful);
void startPumpControlResult(bool aIsSucessful);
void startAutoLocateResult(bool aIsSucessful);
@@ -197,12 +187,9 @@ private:
int mScanProgressTimer = -1;
int mCheckInitStatusTimer = -1;
int mGetAutoLocatePositionTimer = -1;
- int mTransferProgress = 0;
int mEffectivePositionCount = 0;
bool mIsEmptyScan = false;
- bool mIsTransferEmptyScan = false;
bool mIsScanning = false;
- bool mIsTransfering = false;
bool mIsPreviewing = false;
bool mIsInitializing = false;
bool mIsAutoLocating = false;
@@ -214,8 +201,6 @@ private:
QString mCurrentAccessionNumber = "";
QString mCurrentLaterality = "";
QString mCurrentOperatorName = "";
- QString mCurrentTransferMeasurementID = "";
- QString mCurrentTransferPatientID = "";
QString mSoftwareVersion = "";
QString mReconTransferPath = "";
@@ -226,8 +211,6 @@ private:
DmsSyncAction* mPreviewScanAction = nullptr;
DmsSyncAction* mCEScanAction = nullptr;
DmsSyncAction* mStopScanAction = nullptr;
- DmsSyncAction* mTransferAction = nullptr;
- DmsSyncAction* mGetTransferProgressAction = nullptr;
DmsSyncAction* mGetCEStatusAction = nullptr;
DmsSyncAction* mSetSimulatorModeAction = nullptr;
DmsSyncAction* mSetHeartBeatAction = nullptr;
@@ -238,7 +221,6 @@ private:
DmsAsyncAction* mGetDeviceTemperatureAction = nullptr;
DmsAsyncAction* mGetScanProgressAction = nullptr;
- DmsAsyncAction* mStopTransferAction = nullptr;
DmsAsyncAction* mShutDownAction = nullptr;
DmsAsyncAction* mPumpControlAction = nullptr;
DmsAsyncAction* mGetAutoLocatePositionAction = nullptr;
diff --git a/src/device/InfoReceiveWorker.cpp b/src/device/InfoReceiveWorker.cpp
index 9b3bce0..97c45ad 100644
--- a/src/device/InfoReceiveWorker.cpp
+++ b/src/device/InfoReceiveWorker.cpp
@@ -72,24 +72,11 @@ void InfoReceiveWorker::responsed(int aServerID, int aActionID)
break;
case ACT_SCAN_IMGQUALITI:
DeviceManager::Default()->mCheckDataQualityAction->responsed();
+ break;
default:
break;
}
break;
- case USRV_XFR :
- switch(aActionID)
- {
- case ACT_XFR_START :
- DeviceManager::Default()->mTransferAction->responsed();
- break;
- case ACT_XFR_STOP :
- DeviceManager::Default()->mStopTransferAction->responsed();
- break;
- case ACT_XFR_PROGRESS_PASSIVE :
- DeviceManager::Default()->mGetTransferProgressAction->responsed();
- break;
- }
- break;
case USRV_INFOCFG:
switch(aActionID)
{
diff --git a/src/forms/recon/ReconFormWidget.cpp b/src/forms/recon/ReconFormWidget.cpp
index 3eaf73b..5f043bd 100644
--- a/src/forms/recon/ReconFormWidget.cpp
+++ b/src/forms/recon/ReconFormWidget.cpp
@@ -26,7 +26,6 @@ ReconFormWidget::ReconFormWidget(QWidget *parent)
, mScanTable(new SlideTableView(this))
, mSearchWidget(new ScanSearchCriteriaForm(this))
, mModel(nullptr)
-, mRefreshTimer(new QTimer(this))
{
auto layout = new QHBoxLayout(ui->commandWidget);
layout->setAlignment(Qt::AlignmentFlag::AlignLeft);
@@ -51,10 +50,8 @@ ReconFormWidget::ReconFormWidget(QWidget *parent)
// DeviceManager::Default()->updateReconState();
// });
connect(DeviceManager::Default(), &DeviceManager::updateReconStateFinished, mModel, &QSqlTableModel::select);
- connect(DeviceManager::Default(), &DeviceManager::transferStatusUpdated, mModel, &QSqlTableModel::select);
connect(mSearchWidget, &ScanSearchCriteriaForm::searchFilterUpdated, this, &ReconFormWidget::updateSearchFilter);
connect(mSearchWidget, &ScanSearchCriteriaForm::refreshData, DeviceManager::Default(), &DeviceManager::updateReconState);
- connect(mRefreshTimer, &QTimer::timeout, this, &ReconFormWidget::refreshTransferprogress);
connect(EventCenter::Default(), &EventCenter::AnonymousModeChanged, this, &ReconFormWidget::updateSearchFilter);
connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this, &ReconFormWidget::reloadLanguage);
}
@@ -126,12 +123,10 @@ void ReconFormWidget::showEvent(QShowEvent *aEvent)
{
TabFormWidget::showEvent(aEvent);
DeviceManager::Default()->updateReconState();
- mRefreshTimer->start(1000);
}
void ReconFormWidget::hideEvent(QHideEvent *aEvent)
{
- mRefreshTimer->stop();
TabFormWidget::hideEvent(aEvent);
}
@@ -140,14 +135,6 @@ int ReconFormWidget::getTableColumnIndex(const QString& aColumnName)
return mModel->record().indexOf(aColumnName);
}
-void ReconFormWidget::refreshTransferprogress()
-{
- if(DeviceManager::Default()->updateTransferProgress())
- {
- mScanTable->viewport()->update();
- }
-}
-
void ReconFormWidget::reloadLanguage()
{
mModel->setHeaderData(getTableColumnIndex("PatientID"), Qt::Horizontal, tr("Patient ID"));
diff --git a/src/forms/recon/ReconFormWidget.h b/src/forms/recon/ReconFormWidget.h
index ed22f42..5bb2daf 100644
--- a/src/forms/recon/ReconFormWidget.h
+++ b/src/forms/recon/ReconFormWidget.h
@@ -24,7 +24,6 @@ protected:
private slots:
void updateSearchFilter();
- void refreshTransferprogress();
void reloadLanguage();
private:
@@ -34,7 +33,6 @@ private:
SlideTableView* mScanTable;
ScanSearchCriteriaForm* mSearchWidget;
QSqlTableModel *mModel;
- QTimer* mRefreshTimer;
void initTableView(QHBoxLayout *contentLayout);
diff --git a/src/forms/recon/ReconStateDelegate.cpp b/src/forms/recon/ReconStateDelegate.cpp
index 7dec5cd..06764f4 100644
--- a/src/forms/recon/ReconStateDelegate.cpp
+++ b/src/forms/recon/ReconStateDelegate.cpp
@@ -22,37 +22,7 @@ void ReconStateDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
switch (state)
{
case 0:
- displayText = tr("Wait to transfer");
- break;
- case 100:
- {
- displayText = tr("Transfering");
- int progress = DeviceManager::Default()->getTransferProgress();
- QRect textRect = option.rect;
- textRect.setRight(option.rect.right() - 180);
- painter->drawText(textRect, Qt::AlignCenter, displayText);
-
- QRect progressBarRect = option.rect;
- progressBarRect.setLeft(textRect.right() + 10);
- progressBarRect.setRight(option.rect.right() - 5);
- progressBarRect.setTop(option.rect.top() + 5);
- progressBarRect.setBottom(option.rect.bottom() - 5);
-
- QStyleOptionProgressBarV2 progressBarOption;
- progressBarOption.rect = progressBarRect;
- progressBarOption.minimum = 0;
- progressBarOption.maximum = 100;
- progressBarOption.progress = progress;
- QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
- painter->restore();
- return;
- }
- case 104:
- displayText = tr("Transfer failed");
- painter->setPen(QColor(Qt::red));
- break;
- case 200:
- displayText = tr("Transfer completed");
+ displayText = tr("Scan completed");
break;
case 204:
displayText = tr("Recon create failed");
diff --git a/src/forms/settings/SystemCorrectionForm.cpp b/src/forms/settings/SystemCorrectionForm.cpp
index d4ea98e..182c1a8 100644
--- a/src/forms/settings/SystemCorrectionForm.cpp
+++ b/src/forms/settings/SystemCorrectionForm.cpp
@@ -17,7 +17,6 @@ SystemCorrectionForm::SystemCorrectionForm(QWidget* aParent)
, mCurrentEmptyScanDate(new QLabel(this))
, mExpirationEmptyScanDate(new QLabel(this))
, mCurrentEmptyScanState(new QLabel(this))
- , mTimer(new QTimer(this))
, mEmptyScanState()
{
setObjectName("SystemCorrectionForm");
@@ -115,8 +114,6 @@ void SystemCorrectionForm::init()
LOG_USER_OPERATION("Start Empty Scan")
});
- mTimer->setInterval(1000);
- connect(mTimer, &QTimer::timeout, this, &SystemCorrectionForm::updateEmptyScanTransferProgress);
connect(EventCenter::Default(), &EventCenter::EmptyScanFinished, this, &SystemCorrectionForm::updateEmptyScanDate);
connect(EventCenter::Default(), &EventCenter::EmptyScanDataStateUpdated, this, &SystemCorrectionForm::updateEmptyScanState);
connect(EventCenter::Default(), &EventCenter::EmptyScanDataExpire, this, &SystemCorrectionForm::updateEmptyScanDateExpire);
@@ -138,26 +135,9 @@ void SystemCorrectionForm::updateEmptyScanDate()
void SystemCorrectionForm::updateEmptyScanState()
{
mEmptyScanState = SQLHelper::queryValue("SELECT State FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toInt();
- if(mEmptyScanState == 100 && !mTimer->isActive())
- {
- mTimer->start();
- }
- else if(mEmptyScanState != 100 && mTimer->isActive())
- {
- mTimer->stop();
- }
mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState)));
}
-void SystemCorrectionForm::updateEmptyScanTransferProgress()
-{
- if(DeviceManager::Default()->updateTransferProgress())
- {
- int progress = DeviceManager::Default()->getTransferProgress();
- mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState) + QString::number(progress) + "%"));
- }
-}
-
void SystemCorrectionForm::updateEmptyScanBroked()
{
mEmptyScanState = -1;
@@ -176,10 +156,7 @@ QString SystemCorrectionForm::getStateString(int aState)
{
case -2: return QString(" %1").arg(tr("Expired"));
case -1: return QString(" %1").arg(tr("Broked"));
- case 0: return tr("Wait To Transfer");
- case 100: return tr("Transferring");
- case 104: return QString(" %1").arg(tr("Transfer Failed"));
- case 200: return tr("Transfer succeed");
+ case 0: return tr("Scan completed");
case 204: return QString(" %1").arg(tr("Recon Error"));
case 300: return tr("Normal");
case 304: return QString(" %1").arg(tr("Recon Error"));
diff --git a/src/forms/settings/SystemCorrectionForm.h b/src/forms/settings/SystemCorrectionForm.h
index 22c0414..5e73cba 100644
--- a/src/forms/settings/SystemCorrectionForm.h
+++ b/src/forms/settings/SystemCorrectionForm.h
@@ -21,7 +21,6 @@ private:
private slots:
void updateEmptyScanDate();
void updateEmptyScanState();
- void updateEmptyScanTransferProgress();
void updateEmptyScanDateExpire();
void updateEmptyScanBroked();
@@ -29,7 +28,6 @@ private:
QLabel* mCurrentEmptyScanDate;
QLabel* mExpirationEmptyScanDate;
QLabel* mCurrentEmptyScanState;
- QTimer* mTimer;
int mEmptyScanState;
};
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index a0dbc7f..63fed1a 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -11,10 +11,6 @@
?
-
- Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed
-
-
GUI Software V%1
@@ -67,6 +63,10 @@
Reconstruction Software Loading...
+
+ Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reserved
+
+
AccessionInformation
@@ -313,10 +313,6 @@
DeviceManager
-
- Data is currently being transmitted, please shut down later.
-
-
Shut down failed, please push emergency button to shutdown.
@@ -383,10 +379,6 @@ progress:99%
Create scan data failed
-
- Scan data transfer failed.
-
-
Device is not ready, start scan operation failed!
@@ -403,10 +395,6 @@ progress:99%
Scan completed!
-
- Scan data transfer Succeeded!
-
-
Error:
@@ -1493,22 +1481,6 @@ The emergency button has been pushed. Please reset it before other operations.
ReconStateDelegate
-
- Wait to transfer
-
-
-
- Transfering
-
-
-
- Transfer failed
-
-
-
- Transfer completed
-
-
Recon create failed
@@ -1541,6 +1513,10 @@ The emergency button has been pushed. Please reset it before other operations.
Unknow
+
+ Scan completed
+
+
ScanFormWidget
@@ -1584,10 +1560,6 @@ The emergency button has been pushed. Please reset it before other operations.
Shut Down
-
- Stop Scan Process
-
-
Left side scan initiated, auto positioning in progress.
@@ -1604,6 +1576,10 @@ The emergency button has been pushed. Please reset it before other operations.
Data exporting, patient can leave the holder
+
+ Waterflood
+
+
ScanSearchCriteriaForm
@@ -1913,18 +1889,6 @@ The emergency button has been pushed. Please reset it before other operations.
Broked
-
- Wait To Transfer
-
-
-
- Transferring
-
-
-
- Transfer Failed
-
-
Recon Error
@@ -1937,10 +1901,6 @@ The emergency button has been pushed. Please reset it before other operations.
Unknow
-
- Transfer succeed
-
-
Expired
@@ -1949,6 +1909,10 @@ The emergency button has been pushed. Please reset it before other operations.
Current state for Empty Scanning %1
+
+ Scan completed
+
+
SystemSettingForm
diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index 63aa181..e095d2c 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -15,11 +15,6 @@
?
-
-
- Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed
-
-
USCT Software V0.1.0
@@ -71,6 +66,11 @@
Qt 5.12.0
+
+
+ Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reserved
+
+
Copyright (c) 1994-2021, OFFIS e.V.
@@ -468,52 +468,52 @@
DeviceManager
-
-
-
-
+
+
+
+
DMS connection error
DMS失去连接
-
-
+
+
progress:%1%
进度:%1%
-
+
Patient can leave.
progress:%1%
检查对象可以起身
进度:%1%
-
+
Data quality assessment in progress
progress:99%
数据质量判断中
进度:99%
-
-
-
+
+
+
Initialize Failed.
初始化失败
-
+
Fail to connect to DB!Reboot device to try!
数据库连接失败,请重启设备后再试!
-
+
Device is not ready, start scan operation failed!
设备状态错误,无法开始检查流程
-
+
Device is not ready, start empty scan operation failed!
设备状态错误,无法开始空水扫查
@@ -530,86 +530,72 @@ After lying down, click the confirm buttonto start scanning on the next side.扫查结束
-
+
Error:
错误:
-
+
Start scan failed. Reason:time out.
扫查启动失败,原因:超时
-
+
Start scan failed. Reason:%1
扫查启动失败,原因:%1
-
+
Start CE Scan Failed.
CE扫查启动失败
-
- Data is currently being transmitted, please shut down later.
- 数据传输中,请稍后再执行关机。
-
-
-
+
Shut down failed, please push emergency button to shutdown.
关机失败,请按紧急按钮进行关机。
-
-
-
Scan data transfer failed.
- 扫查数据上传失败
+ 扫查数据上传失败
-
- Scan data transfer Succeeded!
-
-
-
-
+
Create empty scan data failed
空水数据新增失败
-
+
Create scan data failed
扫查数据新增失败
-
+
Recon disconnected.
重建服务器已断开连接
-
-
+
+
Open pump failed.
排水阀打开失败
-
+
Recon error, can't start scan process
重建服务器错误,无法开始检查流程
-
-
+
Start auto locate failed
自动化定位启动失败
-
+
The data quality is low, please restart the data scan.
扫查数据质量较低,请重新开始检查流程
-
+
Device reset failed, please contact maintenance person
设备复位失败,请联系维修人员
@@ -642,62 +628,62 @@ After lying down, click the confirm buttonto start scanning on the next side.
DicomCfgDialog
-
+
Dialog
检查对象信息
-
+
DICOM Settings
DICOM 配置
-
-
-
+
+
+
IP
-
-
-
+
+
+
AE
AE
-
-
-
+
+
+
Port
-
-
-
+
+
+
Name
姓名
-
-
-
+
+
+
...
DICOM
-
+
Worklist
新增(拉取)
-
+
PACS
-
+
3D Recon
@@ -715,27 +701,27 @@ After lying down, click the confirm buttonto start scanning on the next side.
DicomSettingsArea
-
+
Form
-
+
Local AE
本机AE
-
+
Server Ip
服务器地址
-
+
Server AE
服务器AE
-
+
Server Port
服务器端口
@@ -842,7 +828,7 @@ After lying down, click the confirm buttonto start scanning on the next side.
GUIMessageDialog
-
+
Dialog
@@ -1098,7 +1084,7 @@ After lying down, click the confirm buttonto start scanning on the next side.
InputModeMenu
-
+
Form
@@ -1144,200 +1130,200 @@ After lying down, click the confirm buttonto start scanning on the next side.
Keyboard
-
+
Form
-
+
q
-
+
w
-
+
e
-
+
r
-
+
t
-
+
y
-
+
u
-
+
i
-
+
o
-
+
p
-
-
+
+
Back
-
+
a
-
+
s
-
+
d
-
+
f
-
+
g
-
+
h
-
+
j
-
+
k
-
+
l
-
+
Enter
-
+
小写
-
+
z
-
+
x
-
+
c
-
+
v
-
+
b
-
+
n
-
+
m
-
+
↑
-
+
?123
-
-
+
+
En
-
+
Space
-
-
+
+
Hide
-
+
←
-
+
↓
-
+
→
-
+
Clear
@@ -1543,7 +1529,7 @@ After lying down, click the confirm buttonto start scanning on the next side.
MainWindow
-
+
MainWindow
@@ -1665,102 +1651,102 @@ After lying down, click the confirm buttonto start scanning on the next side.
NetworkCfgDialog
-
-
+
+
Network Settings
网络配置
-
+
IP Address
IP地址
-
+
DHCP
-
+
Dev
设备
-
+
Subnet Mask
子网掩码
-
+
Additional Address
额外地址
-
-
+
+
Add
新增
-
-
+
+
Edit
编辑
-
-
+
+
Delete
删除
-
+
Address
IP配置
-
+
Default IPv4 Gateway
默认网关
-
+
Routing Table
路由表
-
+
Routing
路由配置
-
+
Name
姓名
-
+
Port
-
+
AE
AE
-
+
IP
-
+
DICOM
-
+
Result
结果
@@ -1988,13 +1974,13 @@ After lying down, click the confirm buttonto start scanning on the next side.PatientInformation
-
+
Scheduled Date
检查日期
-
+
Accession Number
检查单号
@@ -2002,42 +1988,42 @@ After lying down, click the confirm buttonto start scanning on the next side.
PatientInformationForm
-
+
Form
-
+
Current Patient
当前患者信息
-
+
Patient Name:
患者姓名:
-
+
Patient ID:
患者编码:
-
+
Patient Birthday:
出生日期:
-
+
Patient Gender:
患者性别:
-
+
Patient AccessionNum:
检查单号:
-
+
Scan Protocol:
检查身侧:
@@ -2070,12 +2056,12 @@ After lying down, click the confirm buttonto start scanning on the next side.单侧右
-
+
Left
左侧
-
+
Right
右侧
@@ -2196,44 +2182,44 @@ The emergency button has been pushed. Please reset it before other operations.
刷新
-
-
+
+
Patient ID
检查对象ID
-
-
+
+
Accession Number
检查单号
-
-
+
+
Patient Name
检查对象姓名
-
-
+
+
Operator Name
操作员
-
-
+
+
Scan Time
检查时间
-
-
+
+
Laterality
检查位置
-
-
+
+
State
重建状态
@@ -2295,64 +2281,65 @@ The emergency button has been pushed. Please reset it before other operations.
ReconStateDelegate
-
Wait to transfer
- 等待数据传输
+ 等待数据传输
-
Transfering
- 数据传输中
+ 数据传输中
-
Transfer failed
- 数据传输失败
+ 数据传输失败
-
Transfer completed
- 数据传输成功
+ 数据传输成功
-
-
+
+ Scan completed
+ 扫查结束
+
+
+
+
Recon create failed
重建任务建立失败
-
-
+
+
Wait to recon
等待重建
-
+
Recon ing
重建中
-
+
Recon failed
重建失败
-
+
Recon succeed
重建成功
-
+
PACS failed
归档失败
-
+
PACS succeed
归档成功
-
+
Unknow
未知
@@ -2376,22 +2363,22 @@ The emergency button has been pushed. Please reset it before other operations.
空扫
-
-
-
-
+
+
+
+
Drainage
排水
-
-
+
+
Account
账户
-
-
+
+
ShutDown
关机
@@ -2400,70 +2387,73 @@ The emergency button has been pushed. Please reset it before other operations.
录入检查对象
-
-
-
+
+
Start Scan
开始检查流程
-
+
+ Waterflood
+
+
+
+
Make sure to open the drain valve ?
请确认是否打开排水阀?
-
+
Confirm Drainage
排水确认
-
-
-
+
+
+
Drainaging
排水中
-
+
Shut down now ?
是否需要进行设备关机操作,请确认?
-
+
Shut Down
关机
-
-
-
+
+
+
Please confirm checking patient information to start the process
请确定检查对象信息开始流程
-
+
Data scanning, please keep the current position and don't move.
数据扫查中,请检查对象保持当前姿势,不要移动
-
+
Data exporting, patient can leave the holder
数据导出中,检查对象可以离开检查仓
-
+
Left side scan initiated, auto positioning in progress.
左侧扫查启动,自动定位中
-
+
Right side scan initiated, auto positioning in progress.
右侧扫查启动,自动定位中
-
Stop Scan Process
- 退出检查流程
+ 退出检查流程
some settings
@@ -2480,37 +2470,37 @@ parameters
ScanSearchCriteriaForm
-
+
Form
-
+
Scan Search
按日期查找
-
+
Today
今天
-
+
Yesterday
昨天
-
+
Last 7 days
过去7天
-
+
Search All
所有信息
-
+
Scan date from
开始日期
@@ -2519,58 +2509,58 @@ parameters
DICOM
-
+
Scan date to
结束日期
-
+
Search Dates
检索
-
+
Search Criteria
按条件查找
-
+
Retrieve
检索
-
+
Accession Number
检查单号
-
+
Manual Refresh
手动刷新
-
+
Refresh
刷新
-
+
Patient ID
检查对象ID
-
+
Patient Name
检查对象姓名
-
+
Clear Fields
清空
-
+
Last %1 days
过去%1天
@@ -2583,80 +2573,80 @@ parameters
-
+
Worklist
在线
-
-
+
+
Add
新增
-
-
+
+
Edit
编辑
-
+
Patient Information Manage
检查对象信息录入
-
+
Local
本地
-
-
+
+
Delete
删除
-
-
+
+
Pull
拉取
-
-
+
+
Select
选择
-
+
Can't delete selected Patient !
不能删除已经被选择的对象
-
-
+
+
Alert
-
+
Delete Patient "%1" ?
删除检查对象"%1"?
-
+
Confirm
确认
-
+
Can't delete selected Patient , db submit error!
-
+
ID
检查对象ID
@@ -2665,32 +2655,32 @@ parameters
检查单号
-
-
+
+
Name
姓名
-
-
+
+
Birth Date
出生日期
-
-
+
+
Gender
性别
-
-
+
+
Add Date
添加日期
-
-
+
+
Comment
备注
@@ -2760,84 +2750,84 @@ parameters
StartScanProcessDialog
-
+
Dialog
检查对象信息
-
+
Patien Information
检查对象信息
-
+
PatientBirth:
出生日期:
-
+
PatientGender:
患者性别:
-
-
+
+
AccessionNumber:
检查单号:
-
-
+
+
ScanProtocol:
检查身侧:
-
+
PatientName:
患者姓名:
-
+
PatientID:
患者编码:
-
+
Protocol Settings
当前流程设置
-
+
<html><head/><body><p><br/></p></body></html>
-
+
left->right
左->右
-
+
right->left
右->左
-
+
only left
单侧左
-
+
only right
单侧右
-
+
start Scan
立即开始
-
+
Cancel
稍后开始
@@ -2853,113 +2843,113 @@ parameters
SystemCorrectionForm
-
-
+
+
Scan Preparation
扫查准备
-
-
+
+
Empty Scan
空水扫描
-
-
+
+
Empty water scanning involves collecting ultrasound data while the tank is filled with water and free of any objects. It is essential to ensure that the tank is fully filled with water and devoid of any objects before conducting the scan. The purpose of collecting empty water data is to obtain baseline information on the time and energy variations of ultrasound propagation inside the inspection tank. This information is utilized for reconstructing reference data for transmission ultrasound imaging. Additionally, empty water data can be utilized for system status assessment and spatial calibration of the system. Therefore, empty water scanning should be performed regularly, with a frequency of once every month.
空水扫描是采集空水时的超声数据,需确保检查仓内部装满水且无物体时执行。空水数据是为了获取超声在检查仓内部传播的时间和能量的变化基准信息,用于重建透射超声图像的参考数据。另一方面,空水数据也可给系统状态的判断和系统的空间校正提供数据支持,故空水扫描需隔一个月定期执行。
-
-
-
+
+
+
Current date for Empty Scanning %1-%2-%3
当前空水数据扫描时间 %1年%2月%3日
-
-
+
+
%1-%2-%3
%1年%2月%3日
-
-
-
+
+
+
Expiration date for Empty Scanning %1
当前空水数据有效期限%1
-
-
+
+
Excute empty scan
执行空水扫描
-
+
Please make sure the holder is only contain water!
请确认Holder中已灌满水,并没有其他物体的情况下再启动空水扫描
-
+
Confirm Scan
扫查确认
-
-
-
-
-
-
-
+
+ Scan completed
+ 扫查结束
+
+
+
+
+
+
+
+
Current state for Empty Scanning %1
当前空水数据系统状态 %1
-
+
Expired
过期
-
+
Broked
损坏
-
Wait To Transfer
- 等待传输
+ 等待传输
-
Transferring
- 传输中
+ 传输中
-
Transfer Failed
- 传输失败
+ 传输失败
-
Transfer succeed
- 传输成功
+ 传输成功
-
-
+
+
Recon Error
服务器端错误
-
+
Normal
正常
-
+
Unknow
未知
@@ -2967,7 +2957,7 @@ parameters
SystemSettingForm
-
+
Form
@@ -2988,7 +2978,7 @@ parameters
自动验证
-
+
IP
@@ -2997,22 +2987,22 @@ parameters
Worklist过滤器
-
+
Recon Settings
Recon
-
+
Worklist Settings
Worklist
-
+
Pacs Settings
Pacs
-
+
Mpps Settings
Mpps
@@ -3032,7 +3022,7 @@ parameters
TabFormWidget
-
+
Form