diff --git a/cfgs/usct-product.json b/cfgs/usct-product.json
index e33f6ea..ec331f4 100644
--- a/cfgs/usct-product.json
+++ b/cfgs/usct-product.json
@@ -122,10 +122,6 @@
"reconlist": {
"expire": "30"
},
- "filter": {
- "usage": "0",
- "maximumusage": "100"
- },
"WaterProcess": {
"AutoDrainage": false
}
diff --git a/src/forms/scan/ScanFormWidget.cpp b/src/forms/scan/ScanFormWidget.cpp
index 2cf6c92..2c94f7c 100644
--- a/src/forms/scan/ScanFormWidget.cpp
+++ b/src/forms/scan/ScanFormWidget.cpp
@@ -22,7 +22,6 @@
#include "components/WaveWidget.h"
#include "components/ZFlashWidget.h"
#include "utilities/ScanProcessSequence.h"
-#include "utilities/FilterUsageCalculator.h"
#include "dicom/MPPSManager.h"
#ifdef WIN32
@@ -128,9 +127,7 @@ void ScanFormWidget::initCommandWidget(QHBoxLayout *layout)
connect(mWaterfloodButton, &QToolButton::clicked, [this](bool aStatus)
{
- QString filterMessage = FilterUsageCalculator::getCurrentFilterUsage() > FilterUsageCalculator::getMaximumFilterUsage() ?
- tr("\n(The filter element has expired, please pay attention to replacing the filter element)"):"";
- if(aStatus && DialogManager::Default()->requestAlertMessage(tr("Please confirm if water injection is required ?") + filterMessage, DialogButtonMode::OkAndCancel, tr("Confirm Water Injection")) == QDialog::Rejected)
+ if(aStatus && DialogManager::Default()->requestAlertMessage(tr("Please confirm if water injection is required ?"), DialogButtonMode::OkAndCancel, tr("Confirm Water Injection")) == QDialog::Rejected)
{
mWaterfloodButton->setChecked(!aStatus);
return;
@@ -172,9 +169,7 @@ void ScanFormWidget::initCommandWidget(QHBoxLayout *layout)
connect(mCleanButton, &QToolButton::clicked, [this](bool aStatus)
{
- QString filterMessage = FilterUsageCalculator::getCurrentFilterUsage() > FilterUsageCalculator::getMaximumFilterUsage() ?
- tr("\n(The filter element has expired, please pay attention to replacing the filter element)"):"";
- if(aStatus && DialogManager::Default()->requestAlertMessage(tr("Please confirm if cleaning and disinfection are required ?") + filterMessage, DialogButtonMode::OkAndCancel, tr("Confirm cleaning")) == QDialog::Rejected)
+ if(aStatus && DialogManager::Default()->requestAlertMessage(tr("Please confirm if cleaning and disinfection are required ?"), DialogButtonMode::OkAndCancel, tr("Confirm cleaning")) == QDialog::Rejected)
{
mCleanButton->setChecked(!aStatus);
return;
@@ -289,7 +284,6 @@ void ScanFormWidget::initCommandWidget(QHBoxLayout *layout)
switch (mWaterProcessMode)
{
case WaterFloodMode:
- FilterUsageCalculator::addFilterUsageByWaterFloodMode();
message = tr("Waterflood finished.");
DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkOnly, tr("Confirm Water Injection"));
break;
@@ -408,7 +402,6 @@ void ScanFormWidget::processWaterCleanResult()
switch (mWaterCleanStep)
{
case FirstWaterClean:
- FilterUsageCalculator::addFilterUsageByCleanMode();
message = tr("Please click the confirm button for cleaning after disinfection.");
if(DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkAndCancel, tr("Confirm cleaning")) == QDialog::Accepted)
{
@@ -416,7 +409,6 @@ void ScanFormWidget::processWaterCleanResult()
}
break;
case SecondWaterClean:
- FilterUsageCalculator::addFilterUsageByCleanMode();
message = tr("cleanning finished.");
DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkOnly, tr("Confirm cleaning"));
break;
diff --git a/src/forms/settings/GeneralForm.cpp b/src/forms/settings/GeneralForm.cpp
index 86be600..70bc7b7 100644
--- a/src/forms/settings/GeneralForm.cpp
+++ b/src/forms/settings/GeneralForm.cpp
@@ -23,7 +23,6 @@
#include "utilities/GetLockScreenTimeHelper.h"
#include "utilities/GetProtocalHelper.h"
#include "utilities/WorklistFilterHelper.h"
-#include "utilities/FilterUsageCalculator.h"
GeneralForm::GeneralForm(QWidget* aParent)
: QWidget(aParent)
@@ -120,19 +119,6 @@ GeneralForm::GeneralForm(QWidget* aParent)
worklistFilterDateHeaderLayout->addWidget(worklistFilterDateButton);
worklistFilterDateHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
- //Filter Usage Reset
- QWidget* filterUsageHeader = new QWidget(this);
- mLayout->addWidget(filterUsageHeader);
- QHBoxLayout* filterUsageLayout = new QHBoxLayout(filterUsageHeader);
- QLabel* filterUsageLabel = new QLabel(tr("Filter Usage Reset"), this);
- filterUsageLayout->addWidget(filterUsageLabel);
- filterUsageLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
- QPushButton* filterUsageResetButton = new QPushButton(filterUsageHeader);
- filterUsageResetButton->setFixedWidth(180);
- filterUsageResetButton->setText(tr("Reset"));
- filterUsageLayout->addWidget(filterUsageResetButton);
- filterUsageLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
-
//Complete Notify
QWidget* scanCompleteHeader = new QWidget(this);
mLayout->addWidget(scanCompleteHeader);
@@ -267,8 +253,6 @@ GeneralForm::GeneralForm(QWidget* aParent)
diskLabel->setText(tr("Disk Storage"));
worklistFilterDateLabel->setText(tr("Worklist Date Filter"));
worklistFilterModalityLabel->setText(tr("Worklist Modality Filter"));
- filterUsageLabel->setText(tr("Filter Usage Reset"));
- filterUsageResetButton->setText(tr("Reset"));
autoDrainageLabel->setText(tr("Auto Drainage"));
anonyButton->setChecked(JsonObject::Instance()->getAnonymousMode());
scanProtocolButton->setText(GetProtocalHelper::getProtocalStr());
@@ -340,14 +324,6 @@ GeneralForm::GeneralForm(QWidget* aParent)
}
});
- connect(filterUsageResetButton, &QPushButton::clicked, []()
- {
- if (DialogManager::Default()->requestAlertMessage(tr("Please confirm whether to reset the filter usage?"),DialogButtonMode::OkAndCancel) == QDialog::Accepted)
- {
- FilterUsageCalculator::clearFilterUsage();
- }
- });
-
connect(scanCompleteButton, &ImageSwitch::clicked, [=]()
{
bool isOpen = scanCompleteButton->getChecked();
diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp
index 1527a7c..1efaeb5 100644
--- a/src/json/jsonobject.cpp
+++ b/src/json/jsonobject.cpp
@@ -14,7 +14,6 @@ namespace
const char* strProductFileName = "./cfgs/usct-product.json";
const char* strProductFileNameDefault = "./cfgs/usct-product";
const QString DEFAULT_RECON_TRANSFER_PATH = "/home/data/Storage/Raw";
- const int DEFAULT_MAXIMUM_FILTER_USAGE = 100;
}
JsonObject::JsonObject()
@@ -76,9 +75,6 @@ void JsonObject::init()
mOperationLogExpireDays = QString(getJsonString("operatorlog", "expire")).toInt();
mPatientListExpireDays = QString(getJsonString("patientlist", "expire")).toInt();
mScanListExpireDays = QString(getJsonString("reconlist", "expire")).toInt();
- mFilterUsage = QString(getJsonString("filter","usage")).toInt();
- int maximumFilterUsage = QString(getJsonString("filter","maximumusage")).toInt();
- mMaximumFilterUsage = maximumFilterUsage <=0? DEFAULT_MAXIMUM_FILTER_USAGE : maximumFilterUsage;
mWorklistHost.ae = QString(getJsonString("worklist", "ae"));
mWorklistHost.ip = QString(getJsonString("worklist", "ip"));
@@ -701,22 +697,6 @@ void JsonObject::setWorklistFilterDate(const QString& aDate)
setJsonString("worklistfilter","date", aDate.toStdString().c_str());
}
-int JsonObject::getFilterUsage()
-{
- return mFilterUsage;
-}
-
-void JsonObject::setFilterUsage(int aUsage)
-{
- mFilterUsage = aUsage;
- setJsonString("filter", "usage", QString::number(mFilterUsage).toStdString().c_str());
-}
-
-int JsonObject::getFilterMaximumUsage()
-{
- return mMaximumFilterUsage;
-}
-
bool JsonObject::getAutoDrainage()
{
return mAutoDrainage;
diff --git a/src/json/jsonobject.h b/src/json/jsonobject.h
index 1c80622..a17c85a 100644
--- a/src/json/jsonobject.h
+++ b/src/json/jsonobject.h
@@ -138,11 +138,6 @@ public:
QString getWorklistFilterDate();
void setWorklistFilterDate(const QString& aDate);
- int getFilterUsage();
- void setFilterUsage(int aUsage);
- int getFilterMaximumUsage();
-
-
private:
void setJsonString(const char* catergory, const char* stringName, const char* stringValue, bool save = true);
char* getJsonString(const char* catergory, const char* stringName);
@@ -189,8 +184,6 @@ private:
int mOperationLogExpireDays;
int mPatientListExpireDays;
int mScanListExpireDays;
- int mFilterUsage;
- int mMaximumFilterUsage;
host mWorklistHost;
diff --git a/src/translations/en_US.ts b/src/translations/en_US.ts
index 2dbc2f8..23b5858 100644
--- a/src/translations/en_US.ts
+++ b/src/translations/en_US.ts
@@ -665,14 +665,6 @@ Error:
Worklist Date Filter
-
- Filter Usage Reset
-
-
-
- Reset
-
-
Auto Drainage
@@ -681,10 +673,6 @@ Error:
Default Scan Protocol
-
- Please confirm whether to reset the filter usage?
-
-
GetAdminPsw
@@ -1671,11 +1659,6 @@ The emergency button has been pushed. Please reset it before other operations.Drainage finished. Please do the disinfection in next step.
-
-
-(The filter element has expired, please pay attention to replacing the filter element)
-
-
Please confirm if cleaning and disinfection are required ?
diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts
index d2965e6..27815ac 100644
--- a/src/translations/zh_CN.ts
+++ b/src/translations/zh_CN.ts
@@ -639,33 +639,33 @@ After lying down, click the confirm buttonto start scanning on the next side.过去7天
-
+
Add Account
新增账户
-
-
+
+
Edit Account
编辑账户
-
+
Add Patient
新增患者
-
+
Edit Patient
编辑患者
-
+
The left emergency button has been pressed. Please reset left the emergency button before operating the device
左侧急停按钮被按下，请将左侧急停按钮复位后，再进行设备操作
-
+
The right emergency button has been pressed. Please reset right the emergency button before operating the device
右侧急停按钮被按下，请将右侧急停按钮复位后，再进行设备操作
@@ -904,79 +904,74 @@ After lying down, click the confirm buttonto start scanning on the next side.
GeneralForm
-
-
+
+
Language
语言
-
+
Institution Name
机构名称
-
-
-
+
+
+
Institution Addr
机构地址
-
-
+
+
Lock Screen
锁屏时间
-
-
+
+
Worklist Modality Filter
Worklist模态过滤器
-
-
+
+
Worklist Date Filter
Worklist时间过滤器
-
-
Filter Usage Reset
- 重置滤芯使用量
+ 重置滤芯使用量
-
-
Reset
- 重置
+ 重置
-
-
+
+
Anonymous Mode
匿名模式
-
-
+
+
Screen Saver
屏保
-
-
+
+
Auto Drainage
自动排水
-
Please confirm whether to reset the filter usage?
- 请确认是否重置滤芯用量?
+ 请确认是否重置滤芯用量?
-
-
+
+
Complete Notify
检查结束确认
@@ -985,8 +980,8 @@ After lying down, click the confirm buttonto start scanning on the next side.Worklist过滤器
-
-
+
+
Disk Storage
磁盘存储
@@ -995,28 +990,28 @@ After lying down, click the confirm buttonto start scanning on the next side.中文
-
+
Used: %1G
使用: %1G
-
+
Total: %1G
总量: %1G
-
+
Get disk used size fail!
磁盘使用空间获取失败！
-
-
+
+
Default Scan Protocol
默认检查协议
-
+
Get disk total size fail!
磁盘总空间获取失败！
@@ -1623,7 +1618,7 @@ After lying down, click the confirm buttonto start scanning on the next side.请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。
-
+
Warning
警告
@@ -1637,7 +1632,7 @@ After lying down, click the confirm buttonto start scanning on the next side.关机失败，请按紧急按钮进行关机。
-
+
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.
服务器端空水数据损坏，需要进行空水扫查，空水扫查结束前无法进行病人扫查操作。
@@ -2426,29 +2421,29 @@ The emergency button has been pushed. Please reset it before other operations.空扫
-
-
+
+
Account
账户
-
+
Drainage time out
排水运行超时
-
+
Waterflood time out
注水运行超时
-
+
Clean time out
清洁运行超时
-
-
+
+
ShutDown
关机
@@ -2457,187 +2452,185 @@ The emergency button has been pushed. Please reset it before other operations.录入患者
-
-
+
+
Start Scan
开始检查流程
-
-
-
-
-
+
+
+
+
+
Waterflood
注水
-
-
-
-
+
+
+
+
Clean
清洁
-
+
Please confirm if water injection is required ?
请确认是否进行注水?
-
-
+
+
Confirm Water Injection
注水确认
-
-
+
+
Waterflooding
注水中
-
-
+
+
Confirm Drainage
排水确认
-
+
Please confirm if drainage is required ?
请确认是否进行排水?
-
+
+
-
Confirm cleaning
清洁确认
-
-
-
-
+
+
+
+
Cleaning
清洁中
-
+
exit failed.
退出失败
-
+
Waterflood finished.
注水完成
-
+
Please click the confirm button for cleaning after disinfection.
请消毒完成后，再点击确认按钮进行清洁
-
+
Waterflood failed.
注水失败
-
-
-
-
-
+
+
+
+
+
Drain
排水
-
-
(The filter element has expired, please pay attention to replacing the filter element)
-
+
(滤芯到期，请注意更换滤芯)
-
-
+
+
Draining
排水中
-
+
Please confirm if cleaning and disinfection are required ?
请确认是否进行清洁消毒?
-
+
Drainage finished. Please do the disinfection in next step.
排水完成，请下一步进行清洁消毒
+
+
-
-
Error:
错误:
-
+
Drainage failed.
排水失败
-
+
Clean failed.
清洁失败
-
+
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
数据导出中，患者可以离开检查仓
-
+
Data exporting, patient can leave the holder, drainage in progress.
数据导出中，患者可以离开检查仓，自动排水中
-
+
cleanning finished.
清洁完成
-
+
Left side scan initiated, auto positioning in progress.
左侧扫查启动，自动定位中
-
+
Right side scan initiated, auto positioning in progress.
右侧扫查启动，自动定位中
diff --git a/src/utilities/FilterUsageCalculator.cpp b/src/utilities/FilterUsageCalculator.cpp
deleted file mode 100644
index 8cc0ee6..0000000
--- a/src/utilities/FilterUsageCalculator.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "FilterUsageCalculator.h"
-
-#include "json/jsonobject.h"
-
-void FilterUsageCalculator::clearFilterUsage()
-{
- JsonObject::Instance()->setFilterUsage(0);
-}
-
-void FilterUsageCalculator::addFilterUsageByCleanMode()
-{
- int filterUsage = JsonObject::Instance()->getFilterUsage();
- filterUsage +=1;
- JsonObject::Instance()->setFilterUsage(filterUsage);
-}
-
-void FilterUsageCalculator::addFilterUsageByWaterFloodMode()
-{
- int filterUsage = JsonObject::Instance()->getFilterUsage();
- filterUsage +=2;
- JsonObject::Instance()->setFilterUsage(filterUsage);
-}
-
-int FilterUsageCalculator::getCurrentFilterUsage()
-{
- return JsonObject::Instance()->getFilterUsage();
-}
-
-int FilterUsageCalculator::getMaximumFilterUsage()
-{
- return JsonObject::Instance()->getFilterMaximumUsage();
-}
diff --git a/src/utilities/FilterUsageCalculator.h b/src/utilities/FilterUsageCalculator.h
deleted file mode 100644
index bb565ca..0000000
--- a/src/utilities/FilterUsageCalculator.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef FILTERUSAGECALCULATOR_H
-#define FILTERUSAGECALCULATOR_H
-
-
-class FilterUsageCalculator
-{
-public:
- FilterUsageCalculator() = delete;
- static void clearFilterUsage();
- static void addFilterUsageByCleanMode();
- static void addFilterUsageByWaterFloodMode();
- static int getCurrentFilterUsage();
- static int getMaximumFilterUsage();
-};
-
-#endif // FILTERUSAGECALCULATOR_H