diff --git a/src/forms/settings/SystemCorrectionForm.cpp b/src/forms/settings/SystemCorrectionForm.cpp index 1159739..6a063f5 100644 --- a/src/forms/settings/SystemCorrectionForm.cpp +++ b/src/forms/settings/SystemCorrectionForm.cpp @@ -14,9 +14,9 @@ SystemCorrectionForm::SystemCorrectionForm(QWidget* aParent) : QWidget(aParent) - , mCurrentEmptyScanDate(new QLabel(this)) - , mExpirationEmptyScanDate(new QLabel(this)) - , mCurrentEmptyScanState(new QLabel(this)) +// , mCurrentEmptyScanDate(new QLabel(this)) +// , mExpirationEmptyScanDate(new QLabel(this)) +// , mCurrentEmptyScanState(new QLabel(this)) , mEmptyScanState() { setObjectName("SystemCorrectionForm"); @@ -60,20 +60,20 @@ void SystemCorrectionForm::init() endline->setFixedHeight(3); vboxLayout->addWidget(endline); - QDate lastScanDate = SQLHelper::queryValue("SELECT ScanDateTime FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toDate(); - mCurrentEmptyScanDate->setText(tr("Current date for Empty Scanning %1-%2-%3").arg(lastScanDate.year()).arg(lastScanDate.month()).arg(lastScanDate.day())); - vboxLayout->addWidget(mCurrentEmptyScanDate); +// QDate lastScanDate = SQLHelper::queryValue("SELECT ScanDateTime FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toDate(); +// mCurrentEmptyScanDate->setText(tr("Current date for Empty Scanning %1-%2-%3").arg(lastScanDate.year()).arg(lastScanDate.month()).arg(lastScanDate.day())); +// vboxLayout->addWidget(mCurrentEmptyScanDate); - QDate expirationScanDate = lastScanDate.addMonths(1); - QDate currentDate = QDate::currentDate(); - QString dateText = tr("%1-%2-%3").arg(expirationScanDate.year()).arg(expirationScanDate.month()).arg(expirationScanDate.day());; - QString dateFormat = currentDate.daysTo(expirationScanDate) < 3 ? QString("   %1").arg(dateText) : QString(" %1").arg(dateText); - mExpirationEmptyScanDate->setText(tr("Expiration date for Empty Scanning %1").arg(dateFormat)); - vboxLayout->addWidget(mExpirationEmptyScanDate); +// QDate expirationScanDate = lastScanDate.addMonths(1); +// QDate currentDate = QDate::currentDate(); +// QString dateText = tr("%1-%2-%3").arg(expirationScanDate.year()).arg(expirationScanDate.month()).arg(expirationScanDate.day());; +// QString dateFormat = currentDate.daysTo(expirationScanDate) < 3 ? QString("   %1").arg(dateText) : QString(" %1").arg(dateText); +// mExpirationEmptyScanDate->setText(tr("Expiration date for Empty Scanning %1").arg(dateFormat)); +// vboxLayout->addWidget(mExpirationEmptyScanDate); - mEmptyScanState = SQLHelper::queryValue("SELECT State FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toInt(); - mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); - vboxLayout->addWidget(mCurrentEmptyScanState); +// mEmptyScanState = SQLHelper::queryValue("SELECT State FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toInt(); +// mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); +// vboxLayout->addWidget(mCurrentEmptyScanState); QWidget* emptyScanButtonArea = new QWidget(this); QHBoxLayout* emptyScanButtonLayout = new QHBoxLayout(emptyScanButtonArea); @@ -96,11 +96,11 @@ void SystemCorrectionForm::init() title->setText(tr("Scan Preparation")); emptyScanTitle->setText(tr("Empty Scan")); emptyScanDescribe->setText(tr("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.")); - mCurrentEmptyScanDate->setText(tr("Current date for Empty Scanning %1-%2-%3").arg(lastScanDate.year()).arg(lastScanDate.month()).arg(lastScanDate.day())); - QString dateText = tr("%1-%2-%3").arg(expirationScanDate.year()).arg(expirationScanDate.month()).arg(expirationScanDate.day());; - QString dateFormat = currentDate.daysTo(expirationScanDate) < 3 ? QString("   %1").arg(dateText) : QString(" %1").arg(dateText); - mExpirationEmptyScanDate->setText(tr("Expiration date for Empty Scanning %1").arg(dateFormat)); - mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); +// mCurrentEmptyScanDate->setText(tr("Current date for Empty Scanning %1-%2-%3").arg(lastScanDate.year()).arg(lastScanDate.month()).arg(lastScanDate.day())); +// QString dateText = tr("%1-%2-%3").arg(expirationScanDate.year()).arg(expirationScanDate.month()).arg(expirationScanDate.day());; +// QString dateFormat = currentDate.daysTo(expirationScanDate) < 3 ? QString("   %1").arg(dateText) : QString(" %1").arg(dateText); +// mExpirationEmptyScanDate->setText(tr("Expiration date for Empty Scanning %1").arg(dateFormat)); +// mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); emptyScanButton->setText(tr("Excute empty scan")); }); @@ -116,41 +116,41 @@ void SystemCorrectionForm::init() LOG_USER_OPERATION("Start Empty Scan") }); - connect(EventCenter::Default(), &EventCenter::EmptyScanFinished, this, &SystemCorrectionForm::updateEmptyScanDate); - connect(EventCenter::Default(), &EventCenter::EmptyScanDataStateUpdated, this, &SystemCorrectionForm::updateEmptyScanState); - connect(EventCenter::Default(), &EventCenter::EmptyScanDataExpire, this, &SystemCorrectionForm::updateEmptyScanDateExpire); - connect(EventCenter::Default(), &EventCenter::EmptyScanDataBroked, this, &SystemCorrectionForm::updateEmptyScanBroked); +// connect(EventCenter::Default(), &EventCenter::EmptyScanFinished, this, &SystemCorrectionForm::updateEmptyScanDate); +// connect(EventCenter::Default(), &EventCenter::EmptyScanDataStateUpdated, this, &SystemCorrectionForm::updateEmptyScanState); +// connect(EventCenter::Default(), &EventCenter::EmptyScanDataExpire, this, &SystemCorrectionForm::updateEmptyScanDateExpire); +// connect(EventCenter::Default(), &EventCenter::EmptyScanDataBroked, this, &SystemCorrectionForm::updateEmptyScanBroked); } -void SystemCorrectionForm::updateEmptyScanDate() -{ - QDate lastScanDate = QDate::currentDate(); - mCurrentEmptyScanDate->setText(tr("Current date for Empty Scanning %1-%2-%3").arg(lastScanDate.year()).arg(lastScanDate.month()).arg(lastScanDate.day())); - QDate expirationScanDate = lastScanDate.addMonths(1); - QString dateText = tr("%1-%2-%3").arg(expirationScanDate.year()).arg(expirationScanDate.month()).arg(expirationScanDate.day());; - QString dateFormat = QString(" %1").arg(dateText); - mExpirationEmptyScanDate->setText(tr("Expiration date for Empty Scanning %1").arg(dateFormat)); - mEmptyScanState = 0; - mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); -} +//void SystemCorrectionForm::updateEmptyScanDate() +//{ +// QDate lastScanDate = QDate::currentDate(); +// mCurrentEmptyScanDate->setText(tr("Current date for Empty Scanning %1-%2-%3").arg(lastScanDate.year()).arg(lastScanDate.month()).arg(lastScanDate.day())); +// QDate expirationScanDate = lastScanDate.addMonths(1); +// QString dateText = tr("%1-%2-%3").arg(expirationScanDate.year()).arg(expirationScanDate.month()).arg(expirationScanDate.day());; +// QString dateFormat = QString(" %1").arg(dateText); +// mExpirationEmptyScanDate->setText(tr("Expiration date for Empty Scanning %1").arg(dateFormat)); +// mEmptyScanState = 0; +// mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); +//} -void SystemCorrectionForm::updateEmptyScanState() -{ - mEmptyScanState = SQLHelper::queryValue("SELECT State FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toInt(); - mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); -} +//void SystemCorrectionForm::updateEmptyScanState() +//{ +// mEmptyScanState = SQLHelper::queryValue("SELECT State FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toInt(); +// mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); +//} -void SystemCorrectionForm::updateEmptyScanBroked() -{ - mEmptyScanState = -1; - mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); -} +//void SystemCorrectionForm::updateEmptyScanBroked() +//{ +// mEmptyScanState = -1; +// mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); +//} -void SystemCorrectionForm::updateEmptyScanDateExpire() -{ - mEmptyScanState = -2; - mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); -} +//void SystemCorrectionForm::updateEmptyScanDateExpire() +//{ +// mEmptyScanState = -2; +// mCurrentEmptyScanState->setText(tr("Current state for Empty Scanning %1").arg(getStateString(mEmptyScanState))); +//} QString SystemCorrectionForm::getStateString(int aState) { diff --git a/src/forms/settings/SystemCorrectionForm.h b/src/forms/settings/SystemCorrectionForm.h index 5e73cba..a3caf98 100644 --- a/src/forms/settings/SystemCorrectionForm.h +++ b/src/forms/settings/SystemCorrectionForm.h @@ -19,15 +19,15 @@ private: QString getStateString(int aState); private slots: - void updateEmptyScanDate(); - void updateEmptyScanState(); - void updateEmptyScanDateExpire(); - void updateEmptyScanBroked(); +// void updateEmptyScanDate(); +// void updateEmptyScanState(); +// void updateEmptyScanDateExpire(); +// void updateEmptyScanBroked(); private: - QLabel* mCurrentEmptyScanDate; - QLabel* mExpirationEmptyScanDate; - QLabel* mCurrentEmptyScanState; +// QLabel* mCurrentEmptyScanDate; +// QLabel* mExpirationEmptyScanDate; +// QLabel* mCurrentEmptyScanState; int mEmptyScanState; }; diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts index abb07d9..0944607 100644 --- a/src/translations/en_US.ts +++ b/src/translations/en_US.ts @@ -1080,18 +1080,10 @@ After lying down, click the confirm buttonto start scanning on the next side.Shut down failed, please push emergency button to shutdown. - - Please execute the empty scan, assist with system calibration, when empty scan is completed, the system should operate normally. - - Warning - - There are %1 days left until the next empty scan. Please remind users to conduct the empty scan in time. - - Due to empty scan data corruption on the server, needs to be execute the empty scan. No other operations can be conducted until the scan is complete. @@ -1980,18 +1972,6 @@ The emergency button has been pushed. Please reset it before other operations.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 - - - - Expiration date for Empty Scanning %1 - - Excute empty scan @@ -2024,10 +2004,6 @@ The emergency button has been pushed. Please reset it before other operations.Expired - - Current state for Empty Scanning %1 - - Scan completed diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 3879edb..34586b2 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -498,7 +498,7 @@ Patient can leave. progress:%1% - 患者可以起身 + 检查对象可以起身 进度:%1% @@ -1618,21 +1618,17 @@ After lying down, click the confirm buttonto start scanning on the next side.重建 - Please execute the empty scan, assist with system calibration, when empty scan is completed, the system should operate normally. - 请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。 + 请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。 - - Warning 警告 - There are %1 days left until the next empty scan. Please remind users to conduct the empty scan in time. - 距离下次空水扫查还有%1天，请用户及时进行空水扫查。 + 距离下次空水扫查还有%1天，请用户及时进行空水扫查。 @@ -3045,25 +3041,16 @@ parameters 空水扫描是采集空水时的超声数据，需确保检查仓内部装满水且无物体时执行。空水数据是为了获取超声在检查仓内部传播的时间和能量的变化基准信息，用于重建透射超声图像的参考数据。另一方面，空水数据也可给系统状态的判断和系统的空间校正提供数据支持，故空水扫描需隔一个月定期执行。 - - - Current date for Empty Scanning %1-%2-%3 - 当前空水数据扫描时间 %1年%2月%3日 + 当前空水数据扫描时间 %1年%2月%3日 - - - %1-%2-%3 - %1年%2月%3日 + %1年%2月%3日 - - - Expiration date for Empty Scanning %1 - 当前空水数据有效期限%1 + 当前空水数据有效期限%1 @@ -3087,14 +3074,8 @@ parameters 扫查结束 - - - - - - Current state for Empty Scanning %1 - 当前空水数据系统状态 %1 + 当前空水数据系统状态 %1 diff --git a/src/windows/MainWindow.cpp b/src/windows/MainWindow.cpp index 37000a6..dacd739 100644 --- a/src/windows/MainWindow.cpp +++ b/src/windows/MainWindow.cpp @@ -75,7 +75,7 @@ MainWindow::MainWindow(QWidget* aParent) QApplication::processEvents(); }); - connect(EventCenter::Default(), &EventCenter::LoginSuccess, this,&MainWindow::checkEmptyScanValidity); + //connect(EventCenter::Default(), &EventCenter::LoginSuccess, this,&MainWindow::checkEmptyScanValidity); connect(EventCenter::Default(), &EventCenter::EmptyScanFinished, this,&MainWindow::enableAllTabWidget); connect(EventCenter::Default(), &EventCenter::EmptyScanDataCorrupted, this, &MainWindow::handleEmptyScanDataCorrupted); @@ -162,28 +162,28 @@ void MainWindow::initializeLayout() mShutdownWidget->setVisible(false); } -void MainWindow::checkEmptyScanValidity() -{ - QDate lastScanDate = SQLHelper::queryValue("SELECT ScanDateTime FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toDate(); - QDate expirationScanDate = lastScanDate.addMonths(1); - QDate currentDate = QDate::currentDate(); - if(lastScanDate.isNull() || currentDate.daysTo(expirationScanDate) < 0) - { - mTabWidget->setCurrentIndex(3); - EventCenter::Default()->triggerEvent(EmptyScanDataExpire, nullptr, nullptr); - DialogManager::Default()->requestAlertMessage(tr("Please execute the empty scan, assist with system calibration, when empty scan is completed, the system should operate normally."), OkOnly, tr("Warning")); - mTabWidget->setTabEnabled(2, false); - mTabWidget->setTabEnabled(1, false); - mTabWidget->setTabEnabled(0, false); - return; - } +//void MainWindow::checkEmptyScanValidity() +//{ +// QDate lastScanDate = SQLHelper::queryValue("SELECT ScanDateTime FROM EScan ORDER BY ScanDateTime DESC LIMIT 1").toDate(); +// QDate expirationScanDate = lastScanDate.addMonths(1); +// QDate currentDate = QDate::currentDate(); +// if(lastScanDate.isNull() || currentDate.daysTo(expirationScanDate) < 0) +// { +// mTabWidget->setCurrentIndex(3); +// EventCenter::Default()->triggerEvent(EmptyScanDataExpire, nullptr, nullptr); +// DialogManager::Default()->requestAlertMessage(tr("Please execute the empty scan, assist with system calibration, when empty scan is completed, the system should operate normally."), OkOnly, tr("Warning")); +// mTabWidget->setTabEnabled(2, false); +// mTabWidget->setTabEnabled(1, false); +// mTabWidget->setTabEnabled(0, false); +// return; +// } - if(currentDate.daysTo(expirationScanDate) < 3) - { - DialogManager::Default()->requestAlertMessage(tr("There are %1 days left until the next empty scan. Please remind users to conduct the empty scan in time.").arg(currentDate.daysTo(expirationScanDate) + 1), OkOnly, tr("Warning")); - return; - } -} +// if(currentDate.daysTo(expirationScanDate) < 3) +// { +// DialogManager::Default()->requestAlertMessage(tr("There are %1 days left until the next empty scan. Please remind users to conduct the empty scan in time.").arg(currentDate.daysTo(expirationScanDate) + 1), OkOnly, tr("Warning")); +// return; +// } +//} void MainWindow::initializeTabWidget() { diff --git a/src/windows/MainWindow.h b/src/windows/MainWindow.h index 17788c4..b442332 100644 --- a/src/windows/MainWindow.h +++ b/src/windows/MainWindow.h @@ -53,7 +53,7 @@ private: void loadStyleSheet(const QString& aSheetName); void showShutdownWidget(); void processShutdownDmsFailed(); - void checkEmptyScanValidity(); +// void checkEmptyScanValidity(); void enableAllTabWidget(); void handleEmptyScanDataCorrupted();