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

feat: Remove water filter usage.

Browse Source
This commit is contained in:
sunwen
2025-08-01 10:47:06 +08:00
parent c8e781f38a
commit f7d6369c61
9 changed files with 103 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cfgs/usct-product.json
View File

@@ -122,10 +122,6 @@
"reconlist": { "reconlist": {
"expire": "30" "expire": "30"
}, },
"filter": {
"usage": "0",
"maximumusage": "100"
},
"WaterProcess": { "WaterProcess": {
"AutoDrainage": false "AutoDrainage": false
} }

12
src/forms/scan/ScanFormWidget.cpp
View File

@@ -22,7 +22,6 @@
#include "components/WaveWidget.h" #include "components/WaveWidget.h"
#include "components/ZFlashWidget.h" #include "components/ZFlashWidget.h"
#include "utilities/ScanProcessSequence.h" #include "utilities/ScanProcessSequence.h"
#include "utilities/FilterUsageCalculator.h"
#include "dicom/MPPSManager.h" #include "dicom/MPPSManager.h"
#ifdef WIN32 #ifdef WIN32
@@ -128,9 +127,7 @@ void ScanFormWidget::initCommandWidget(QHBoxLayout *layout)
connect(mWaterfloodButton, &QToolButton::clicked, [this](bool aStatus) connect(mWaterfloodButton, &QToolButton::clicked, [this](bool aStatus)
{ {
QString filterMessage = FilterUsageCalculator::getCurrentFilterUsage() > FilterUsageCalculator::getMaximumFilterUsage() ? if(aStatus && DialogManager::Default()->requestAlertMessage(tr("Please confirm if water injection is required ?"), DialogButtonMode::OkAndCancel, tr("Confirm Water Injection")) == QDialog::Rejected)
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)
{ {
mWaterfloodButton->setChecked(!aStatus); mWaterfloodButton->setChecked(!aStatus);
return; return;
@@ -172,9 +169,7 @@ void ScanFormWidget::initCommandWidget(QHBoxLayout *layout)
connect(mCleanButton, &QToolButton::clicked, [this](bool aStatus) connect(mCleanButton, &QToolButton::clicked, [this](bool aStatus)
{ {
QString filterMessage = FilterUsageCalculator::getCurrentFilterUsage() > FilterUsageCalculator::getMaximumFilterUsage() ? if(aStatus && DialogManager::Default()->requestAlertMessage(tr("Please confirm if cleaning and disinfection are required ?"), DialogButtonMode::OkAndCancel, tr("Confirm cleaning")) == QDialog::Rejected)
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)
{ {
mCleanButton->setChecked(!aStatus); mCleanButton->setChecked(!aStatus);
return; return;
@@ -289,7 +284,6 @@ void ScanFormWidget::initCommandWidget(QHBoxLayout *layout)
switch (mWaterProcessMode) switch (mWaterProcessMode)
{ {
case WaterFloodMode: case WaterFloodMode:
FilterUsageCalculator::addFilterUsageByWaterFloodMode();
message = tr("Waterflood finished."); message = tr("Waterflood finished.");
DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkOnly, tr("Confirm Water Injection")); DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkOnly, tr("Confirm Water Injection"));
break; break;
@@ -408,7 +402,6 @@ void ScanFormWidget::processWaterCleanResult()
switch (mWaterCleanStep) switch (mWaterCleanStep)
{ {
case FirstWaterClean: case FirstWaterClean:
FilterUsageCalculator::addFilterUsageByCleanMode();
message = tr("Please click the confirm button for cleaning after disinfection."); message = tr("Please click the confirm button for cleaning after disinfection.");
if(DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkAndCancel, tr("Confirm cleaning")) == QDialog::Accepted) if(DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkAndCancel, tr("Confirm cleaning")) == QDialog::Accepted)
{ {
@@ -416,7 +409,6 @@ void ScanFormWidget::processWaterCleanResult()
} }
break; break;
case SecondWaterClean: case SecondWaterClean:
FilterUsageCalculator::addFilterUsageByCleanMode();
message = tr("cleanning finished."); message = tr("cleanning finished.");
DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkOnly, tr("Confirm cleaning")); DialogManager::Default()->requestAlertMessage(message, DialogButtonMode::OkOnly, tr("Confirm cleaning"));
break; break;

24
src/forms/settings/GeneralForm.cpp
View File

@@ -23,7 +23,6 @@
#include "utilities/GetLockScreenTimeHelper.h" #include "utilities/GetLockScreenTimeHelper.h"
#include "utilities/GetProtocalHelper.h" #include "utilities/GetProtocalHelper.h"
#include "utilities/WorklistFilterHelper.h" #include "utilities/WorklistFilterHelper.h"
#include "utilities/FilterUsageCalculator.h"
GeneralForm::GeneralForm(QWidget* aParent) GeneralForm::GeneralForm(QWidget* aParent)
: QWidget(aParent) : QWidget(aParent)
@@ -120,19 +119,6 @@ GeneralForm::GeneralForm(QWidget* aParent)
worklistFilterDateHeaderLayout->addWidget(worklistFilterDateButton); worklistFilterDateHeaderLayout->addWidget(worklistFilterDateButton);
worklistFilterDateHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed)); 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 //Complete Notify
QWidget* scanCompleteHeader = new QWidget(this); QWidget* scanCompleteHeader = new QWidget(this);
mLayout->addWidget(scanCompleteHeader); mLayout->addWidget(scanCompleteHeader);
@@ -267,8 +253,6 @@ GeneralForm::GeneralForm(QWidget* aParent)
diskLabel->setText(tr("Disk Storage")); diskLabel->setText(tr("Disk Storage"));
worklistFilterDateLabel->setText(tr("Worklist Date Filter")); worklistFilterDateLabel->setText(tr("Worklist Date Filter"));
worklistFilterModalityLabel->setText(tr("Worklist Modality Filter")); worklistFilterModalityLabel->setText(tr("Worklist Modality Filter"));
filterUsageLabel->setText(tr("Filter Usage Reset"));
filterUsageResetButton->setText(tr("Reset"));
autoDrainageLabel->setText(tr("Auto Drainage")); autoDrainageLabel->setText(tr("Auto Drainage"));
anonyButton->setChecked(JsonObject::Instance()->getAnonymousMode()); anonyButton->setChecked(JsonObject::Instance()->getAnonymousMode());
scanProtocolButton->setText(GetProtocalHelper::getProtocalStr()); 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, [=]() connect(scanCompleteButton, &ImageSwitch::clicked, [=]()
{ {
bool isOpen = scanCompleteButton->getChecked(); bool isOpen = scanCompleteButton->getChecked();

20
src/json/jsonobject.cpp
View File

@@ -14,7 +14,6 @@ namespace
const char* strProductFileName = "./cfgs/usct-product.json"; const char* strProductFileName = "./cfgs/usct-product.json";
const char* strProductFileNameDefault = "./cfgs/usct-product"; const char* strProductFileNameDefault = "./cfgs/usct-product";
const QString DEFAULT_RECON_TRANSFER_PATH = "/home/data/Storage/Raw"; const QString DEFAULT_RECON_TRANSFER_PATH = "/home/data/Storage/Raw";
const int DEFAULT_MAXIMUM_FILTER_USAGE = 100;
} }
JsonObject::JsonObject() JsonObject::JsonObject()
@@ -76,9 +75,6 @@ void JsonObject::init()
mOperationLogExpireDays = QString(getJsonString("operatorlog", "expire")).toInt(); mOperationLogExpireDays = QString(getJsonString("operatorlog", "expire")).toInt();
mPatientListExpireDays = QString(getJsonString("patientlist", "expire")).toInt(); mPatientListExpireDays = QString(getJsonString("patientlist", "expire")).toInt();
mScanListExpireDays = QString(getJsonString("reconlist", "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.ae = QString(getJsonString("worklist", "ae"));
mWorklistHost.ip = QString(getJsonString("worklist", "ip")); mWorklistHost.ip = QString(getJsonString("worklist", "ip"));
@@ -701,22 +697,6 @@ void JsonObject::setWorklistFilterDate(const QString& aDate)
setJsonString("worklistfilter","date", aDate.toStdString().c_str()); 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() bool JsonObject::getAutoDrainage()
{ {
return mAutoDrainage; return mAutoDrainage;

7
src/json/jsonobject.h
View File

@@ -138,11 +138,6 @@ public:
QString getWorklistFilterDate(); QString getWorklistFilterDate();
void setWorklistFilterDate(const QString& aDate); void setWorklistFilterDate(const QString& aDate);
int getFilterUsage();
void setFilterUsage(int aUsage);
int getFilterMaximumUsage();
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);
char* getJsonString(const char* catergory, const char* stringName); char* getJsonString(const char* catergory, const char* stringName);
@@ -189,8 +184,6 @@ private:
int mOperationLogExpireDays; int mOperationLogExpireDays;
int mPatientListExpireDays; int mPatientListExpireDays;
int mScanListExpireDays; int mScanListExpireDays;
int mFilterUsage;
int mMaximumFilterUsage;
host mWorklistHost; host mWorklistHost;

17
src/translations/en_US.ts
View File

@@ -665,14 +665,6 @@ Error: </source>
<source>Worklist Date Filter</source> <source>Worklist Date Filter</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Filter Usage Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Auto Drainage</source> <source>Auto Drainage</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@@ -681,10 +673,6 @@ Error: </source>
<source>Default Scan Protocol</source> <source>Default Scan Protocol</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Please confirm whether to reset the filter usage?</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>GetAdminPsw</name> <name>GetAdminPsw</name>
@@ -1671,11 +1659,6 @@ The emergency button has been pushed. Please reset it before other operations.</
<source>Drainage finished. Please do the disinfection in next step.</source> <source>Drainage finished. Please do the disinfection in next step.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>
(The filter element has expired, please pay attention to replacing the filter element)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Please confirm if cleaning and disinfection are required ?</source> <source>Please confirm if cleaning and disinfection are required ?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

209
src/translations/zh_CN.ts
View File

@@ -639,33 +639,33 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
<translation type="obsolete">过去7天</translation> <translation type="obsolete">过去7天</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/DialogManager.cpp" line="157"/> <location filename="../dialogs/DialogManager.cpp" line="163"/>
<source>Add Account</source> <source>Add Account</source>
<translation type="unfinished">新增账户</translation> <translation type="unfinished">新增账户</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/DialogManager.cpp" line="167"/> <location filename="../dialogs/DialogManager.cpp" line="173"/>
<location filename="../dialogs/DialogManager.cpp" line="176"/> <location filename="../dialogs/DialogManager.cpp" line="182"/>
<source>Edit Account</source> <source>Edit Account</source>
<translation type="unfinished">编辑账户</translation> <translation type="unfinished">编辑账户</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/DialogManager.cpp" line="196"/> <location filename="../dialogs/DialogManager.cpp" line="202"/>
<source>Add Patient</source> <source>Add Patient</source>
<translation type="unfinished">新增患者</translation> <translation type="unfinished">新增患者</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/DialogManager.cpp" line="196"/> <location filename="../dialogs/DialogManager.cpp" line="202"/>
<source>Edit Patient</source> <source>Edit Patient</source>
<translation type="unfinished">编辑患者</translation> <translation type="unfinished">编辑患者</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/DialogManager.cpp" line="682"/> <location filename="../dialogs/DialogManager.cpp" line="688"/>
<source>The left emergency button has been pressed. Please reset left the emergency button before operating the device</source> <source>The left emergency button has been pressed. Please reset left the emergency button before operating the device</source>
<translation type="unfinished">左侧急停按钮被按下，请将左侧急停按钮复位后，再进行设备操作</translation> <translation type="unfinished">左侧急停按钮被按下，请将左侧急停按钮复位后，再进行设备操作</translation>
</message> </message>
<message> <message>
<location filename="../dialogs/DialogManager.cpp" line="691"/> <location filename="../dialogs/DialogManager.cpp" line="697"/>
<source>The right emergency button has been pressed. Please reset right the emergency button before operating the device</source> <source>The right emergency button has been pressed. Please reset right the emergency button before operating the device</source>
<translation type="unfinished">右侧急停按钮被按下，请将右侧急停按钮复位后，再进行设备操作</translation> <translation type="unfinished">右侧急停按钮被按下，请将右侧急停按钮复位后，再进行设备操作</translation>
</message> </message>
@@ -904,79 +904,74 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
<context> <context>
<name>GeneralForm</name> <name>GeneralForm</name>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="64"/> <location filename="../forms/settings/GeneralForm.cpp" line="63"/>
<location filename="../forms/settings/GeneralForm.cpp" line="259"/> <location filename="../forms/settings/GeneralForm.cpp" line="245"/>
<source>Language</source> <source>Language</source>
<translation>语言</translation> <translation>语言</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="47"/> <location filename="../forms/settings/GeneralForm.cpp" line="46"/>
<source>Institution Name</source> <source>Institution Name</source>
<translation>机构名称</translation> <translation>机构名称</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="53"/> <location filename="../forms/settings/GeneralForm.cpp" line="52"/>
<location filename="../forms/settings/GeneralForm.cpp" line="260"/> <location filename="../forms/settings/GeneralForm.cpp" line="246"/>
<location filename="../forms/settings/GeneralForm.cpp" line="261"/> <location filename="../forms/settings/GeneralForm.cpp" line="247"/>
<source>Institution Addr</source> <source>Institution Addr</source>
<translation>机构地址</translation> <translation>机构地址</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="76"/> <location filename="../forms/settings/GeneralForm.cpp" line="75"/>
<location filename="../forms/settings/GeneralForm.cpp" line="262"/> <location filename="../forms/settings/GeneralForm.cpp" line="248"/>
<source>Lock Screen</source> <source>Lock Screen</source>
<translation>锁屏时间</translation> <translation>锁屏时间</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="101"/> <location filename="../forms/settings/GeneralForm.cpp" line="100"/>
<location filename="../forms/settings/GeneralForm.cpp" line="269"/> <location filename="../forms/settings/GeneralForm.cpp" line="255"/>
<source>Worklist Modality Filter</source> <source>Worklist Modality Filter</source>
<translation type="unfinished">Worklist模态过滤器</translation> <translation type="unfinished">Worklist模态过滤器</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="114"/> <location filename="../forms/settings/GeneralForm.cpp" line="113"/>
<location filename="../forms/settings/GeneralForm.cpp" line="268"/> <location filename="../forms/settings/GeneralForm.cpp" line="254"/>
<source>Worklist Date Filter</source> <source>Worklist Date Filter</source>
<translation type="unfinished">Worklist时间过滤器</translation> <translation type="unfinished">Worklist时间过滤器</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="127"/>
<location filename="../forms/settings/GeneralForm.cpp" line="270"/>
<source>Filter Usage Reset</source> <source>Filter Usage Reset</source>
<translation type="unfinished">重置滤芯使用量</translation> <translation type="obsolete">重置滤芯使用量</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="132"/>
<location filename="../forms/settings/GeneralForm.cpp" line="271"/>
<source>Reset</source> <source>Reset</source>
<translation type="unfinished">重置</translation> <translation type="obsolete">重置</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="153"/> <location filename="../forms/settings/GeneralForm.cpp" line="139"/>
<location filename="../forms/settings/GeneralForm.cpp" line="265"/> <location filename="../forms/settings/GeneralForm.cpp" line="251"/>
<source>Anonymous Mode</source> <source>Anonymous Mode</source>
<translation type="unfinished">匿名模式</translation> <translation type="unfinished">匿名模式</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="165"/> <location filename="../forms/settings/GeneralForm.cpp" line="151"/>
<location filename="../forms/settings/GeneralForm.cpp" line="266"/> <location filename="../forms/settings/GeneralForm.cpp" line="252"/>
<source>Screen Saver</source> <source>Screen Saver</source>
<translation type="unfinished">屏保</translation> <translation type="unfinished">屏保</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="177"/> <location filename="../forms/settings/GeneralForm.cpp" line="163"/>
<location filename="../forms/settings/GeneralForm.cpp" line="272"/> <location filename="../forms/settings/GeneralForm.cpp" line="256"/>
<source>Auto Drainage</source> <source>Auto Drainage</source>
<translation type="unfinished">自动排水</translation> <translation type="unfinished">自动排水</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="345"/>
<source>Please confirm whether to reset the filter usage?</source> <source>Please confirm whether to reset the filter usage?</source>
<translation type="unfinished">请确认是否重置滤芯用量?</translation> <translation type="obsolete">请确认是否重置滤芯用量?</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="142"/> <location filename="../forms/settings/GeneralForm.cpp" line="128"/>
<location filename="../forms/settings/GeneralForm.cpp" line="264"/> <location filename="../forms/settings/GeneralForm.cpp" line="250"/>
<source>Complete Notify</source> <source>Complete Notify</source>
<translation type="unfinished">检查结束确认</translation> <translation type="unfinished">检查结束确认</translation>
</message> </message>
@@ -985,8 +980,8 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
<translation type="obsolete">Worklist过滤器</translation> <translation type="obsolete">Worklist过滤器</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="198"/> <location filename="../forms/settings/GeneralForm.cpp" line="184"/>
<location filename="../forms/settings/GeneralForm.cpp" line="267"/> <location filename="../forms/settings/GeneralForm.cpp" line="253"/>
<source>Disk Storage</source> <source>Disk Storage</source>
<translation type="unfinished">磁盘存储</translation> <translation type="unfinished">磁盘存储</translation>
</message> </message>
@@ -995,28 +990,28 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
<translation type="obsolete">中文</translation> <translation type="obsolete">中文</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="391"/> <location filename="../forms/settings/GeneralForm.cpp" line="367"/>
<source>Used: %1G</source> <source>Used: %1G</source>
<translation type="unfinished">使用: %1G</translation> <translation type="unfinished">使用: %1G</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="406"/> <location filename="../forms/settings/GeneralForm.cpp" line="382"/>
<source>Total: %1G</source> <source>Total: %1G</source>
<translation type="unfinished">总量: %1G</translation> <translation type="unfinished">总量: %1G</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="395"/> <location filename="../forms/settings/GeneralForm.cpp" line="371"/>
<source>Get disk used size fail!</source> <source>Get disk used size fail!</source>
<translation type="unfinished">磁盘使用空间获取失败！</translation> <translation type="unfinished">磁盘使用空间获取失败！</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="88"/> <location filename="../forms/settings/GeneralForm.cpp" line="87"/>
<location filename="../forms/settings/GeneralForm.cpp" line="263"/> <location filename="../forms/settings/GeneralForm.cpp" line="249"/>
<source>Default Scan Protocol</source> <source>Default Scan Protocol</source>
<translation type="unfinished">默认检查协议</translation> <translation type="unfinished">默认检查协议</translation>
</message> </message>
<message> <message>
<location filename="../forms/settings/GeneralForm.cpp" line="410"/> <location filename="../forms/settings/GeneralForm.cpp" line="386"/>
<source>Get disk total size fail!</source> <source>Get disk total size fail!</source>
<translation type="unfinished">磁盘总空间获取失败！</translation> <translation type="unfinished">磁盘总空间获取失败！</translation>
</message> </message>
@@ -1623,7 +1618,7 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
<translation type="obsolete">请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。</translation> <translation type="obsolete">请先进行空水扫查，辅助系统校正，空水扫查结束后，系统正常运行。</translation>
</message> </message>
<message> <message>
<location filename="../windows/MainWindow.cpp" line="390"/> <location filename="../windows/MainWindow.cpp" line="395"/>
<source>Warning</source> <source>Warning</source>
<translation type="unfinished">警告</translation> <translation type="unfinished">警告</translation>
</message> </message>
@@ -1637,7 +1632,7 @@ After lying down, click the confirm buttonto start scanning on the next side.</s
<translation type="unfinished">关机失败，请按紧急按钮进行关机。</translation> <translation type="unfinished">关机失败，请按紧急按钮进行关机。</translation>
</message> </message>
<message> <message>
<location filename="../windows/MainWindow.cpp" line="390"/> <location filename="../windows/MainWindow.cpp" line="395"/>
<source>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.</source> <source>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.</source>
<translation type="unfinished">服务器端空水数据损坏，需要进行空水扫查，空水扫查结束前无法进行病人扫查操作。</translation> <translation type="unfinished">服务器端空水数据损坏，需要进行空水扫查，空水扫查结束前无法进行病人扫查操作。</translation>
</message> </message>
@@ -2426,29 +2421,29 @@ The emergency button has been pushed. Please reset it before other operations.</
<translation type="obsolete">空扫</translation> <translation type="obsolete">空扫</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="99"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="98"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="617"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="609"/>
<source>Account</source> <source>Account</source>
<translation type="unfinished">账户</translation> <translation type="unfinished">账户</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="77"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="76"/>
<source>Drainage time out</source> <source>Drainage time out</source>
<translation type="unfinished">排水运行超时</translation> <translation type="unfinished">排水运行超时</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="84"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="83"/>
<source>Waterflood time out</source> <source>Waterflood time out</source>
<translation type="unfinished">注水运行超时</translation> <translation type="unfinished">注水运行超时</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="91"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="90"/>
<source>Clean time out</source> <source>Clean time out</source>
<translation type="unfinished">清洁运行超时</translation> <translation type="unfinished">清洁运行超时</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="103"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="102"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="618"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="610"/>
<source>ShutDown</source> <source>ShutDown</source>
<translation type="unfinished">关机</translation> <translation type="unfinished">关机</translation>
</message> </message>
@@ -2457,187 +2452,185 @@ The emergency button has been pushed. Please reset it before other operations.</
<translation type="obsolete">录入患者</translation> <translation type="obsolete">录入患者</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="107"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="106"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="619"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="611"/>
<source>Start Scan</source> <source>Start Scan</source>
<translation type="unfinished">开始检查流程</translation> <translation type="unfinished">开始检查流程</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="116"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="115"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="225"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="220"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="264"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="259"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="444"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="436"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="622"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="614"/>
<source>Waterflood</source> <source>Waterflood</source>
<translation type="unfinished">注水</translation> <translation type="unfinished">注水</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="126"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="125"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="243"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="238"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="456"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="448"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="623"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="615"/>
<source>Clean</source> <source>Clean</source>
<translation type="unfinished">清洁</translation> <translation type="unfinished">清洁</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="133"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="130"/>
<source>Please confirm if water injection is required ?</source> <source>Please confirm if water injection is required ?</source>
<translation type="unfinished">请确认是否进行注水?</translation> <translation type="unfinished">请确认是否进行注水?</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="133"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="130"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="294"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="288"/>
<source>Confirm Water Injection</source> <source>Confirm Water Injection</source>
<translation type="unfinished">注水确认</translation> <translation type="unfinished">注水确认</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="141"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="138"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="622"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="614"/>
<source>Waterflooding</source> <source>Waterflooding</source>
<translation type="unfinished">注水中</translation> <translation type="unfinished">注水中</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="154"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="151"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="298"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="292"/>
<source>Confirm Drainage</source> <source>Confirm Drainage</source>
<translation type="unfinished">排水确认</translation> <translation type="unfinished">排水确认</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="154"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="151"/>
<source>Please confirm if drainage is required ?</source> <source>Please confirm if drainage is required ?</source>
<translation type="unfinished">请确认是否进行排水?</translation> <translation type="unfinished">请确认是否进行排水?</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="177"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="172"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="406"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="413"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="413"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="421"/>
<source>Confirm cleaning</source> <source>Confirm cleaning</source>
<translation type="unfinished">清洁确认</translation> <translation type="unfinished">清洁确认</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="186"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="181"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="270"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="265"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="430"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="422"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="623"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="615"/>
<source>Cleaning</source> <source>Cleaning</source>
<translation type="unfinished">清洁中</translation> <translation type="unfinished">清洁中</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="273"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="268"/>
<source> exit failed.</source> <source> exit failed.</source>
<translation type="unfinished">退出失败</translation> <translation type="unfinished">退出失败</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="293"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="287"/>
<source>Waterflood finished.</source> <source>Waterflood finished.</source>
<translation type="unfinished">注水完成</translation> <translation type="unfinished">注水完成</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="412"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="405"/>
<source>Please click the confirm button for cleaning after disinfection.</source> <source>Please click the confirm button for cleaning after disinfection.</source>
<translation type="unfinished">请消毒完成后，再点击确认按钮进行清洁</translation> <translation type="unfinished">请消毒完成后，再点击确认按钮进行清洁</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="310"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="304"/>
<source>Waterflood failed.</source> <source>Waterflood failed.</source>
<translation type="unfinished">注水失败</translation> <translation type="unfinished">注水失败</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="121"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="120"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="207"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="202"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="267"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="262"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="450"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="442"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="621"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="613"/>
<source>Drain</source> <source>Drain</source>
<translation type="unfinished">排水</translation> <translation type="unfinished">排水</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="132"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="176"/>
<source> <source>
(The filter element has expired, please pay attention to replacing the filter element)</source> (The filter element has expired, please pay attention to replacing the filter element)</source>
<translation type="unfinished"> <translation type="obsolete">
(滤芯到期，请注意更换滤芯)</translation> (滤芯到期，请注意更换滤芯)</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="162"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="159"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="621"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="613"/>
<source>Draining</source> <source>Draining</source>
<translation type="unfinished">排水中</translation> <translation type="unfinished">排水中</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="177"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="172"/>
<source>Please confirm if cleaning and disinfection are required ?</source> <source>Please confirm if cleaning and disinfection are required ?</source>
<translation type="unfinished">请确认是否进行清洁消毒?</translation> <translation type="unfinished">请确认是否进行清洁消毒?</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="297"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="291"/>
<source>Drainage finished. Please do the disinfection in next step.</source> <source>Drainage finished. Please do the disinfection in next step.</source>
<translation type="unfinished">排水完成，请下一步进行清洁消毒</translation> <translation type="unfinished">排水完成，请下一步进行清洁消毒</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="304"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="307"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="310"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="310"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="313"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="316"/>
<source> <source>
Error: </source> Error: </source>
<translation type="unfinished"> <translation type="unfinished">
错误: </translation> 错误: </translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="313"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="307"/>
<source>Drainage failed.</source> <source>Drainage failed.</source>
<translation type="unfinished">排水失败</translation> <translation type="unfinished">排水失败</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="316"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="310"/>
<source>Clean failed.</source> <source>Clean failed.</source>
<translation type="unfinished">清洁失败</translation> <translation type="unfinished">清洁失败</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="327"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="321"/>
<source>Shut down now ?</source> <source>Shut down now ?</source>
<translation type="unfinished">是否需要进行设备关机操作，请确认？</translation> <translation type="unfinished">是否需要进行设备关机操作，请确认？</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="327"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="321"/>
<source>Shut Down</source> <source>Shut Down</source>
<translation type="unfinished">关机</translation> <translation type="unfinished">关机</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="376"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="370"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="477"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="469"/>
<location filename="../forms/scan/ScanFormWidget.cpp" line="620"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="612"/>
<source>Please confirm checking patient information to start the process</source> <source>Please confirm checking patient information to start the process</source>
<translation type="unfinished">请确定患者信息开始流程</translation> <translation type="unfinished">请确定患者信息开始流程</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="381"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="375"/>
<source>Data scanning, please keep the current position and don&apos;t move.</source> <source>Data scanning, please keep the current position and don&apos;t move.</source>
<translation type="unfinished">数据扫查中，请患者保持当前姿势，不要移动</translation> <translation type="unfinished">数据扫查中，请患者保持当前姿势，不要移动</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="386"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="380"/>
<source>Data exporting, patient can leave the holder</source> <source>Data exporting, patient can leave the holder</source>
<translation type="unfinished">数据导出中，患者可以离开检查仓</translation> <translation type="unfinished">数据导出中，患者可以离开检查仓</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="389"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="383"/>
<source>Data exporting, patient can leave the holder, drainage in progress.</source> <source>Data exporting, patient can leave the holder, drainage in progress.</source>
<translation type="unfinished">数据导出中，患者可以离开检查仓，自动排水中</translation> <translation type="unfinished">数据导出中，患者可以离开检查仓，自动排水中</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="420"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="412"/>
<source>cleanning finished.</source> <source>cleanning finished.</source>
<translation type="unfinished">清洁完成</translation> <translation type="unfinished">清洁完成</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="632"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="624"/>
<source>Left side scan initiated, auto positioning in progress.</source> <source>Left side scan initiated, auto positioning in progress.</source>
<translation type="unfinished">左侧扫查启动，自动定位中</translation> <translation type="unfinished">左侧扫查启动，自动定位中</translation>
</message> </message>
<message> <message>
<location filename="../forms/scan/ScanFormWidget.cpp" line="634"/> <location filename="../forms/scan/ScanFormWidget.cpp" line="626"/>
<source>Right side scan initiated, auto positioning in progress.</source> <source>Right side scan initiated, auto positioning in progress.</source>
<translation type="unfinished">右侧扫查启动，自动定位中</translation> <translation type="unfinished">右侧扫查启动，自动定位中</translation>
</message> </message>

32
src/utilities/FilterUsageCalculator.cpp
View File

@@ -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();
}

16
src/utilities/FilterUsageCalculator.h
View File

@@ -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