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

refactor: Modify the display and interaction related to worklist.

Browse Source
This commit is contained in:
sunwen
2024-09-06 17:29:25 +08:00
parent c6c3d81ecf
commit b60c4a8be9
60 changed files with 3336 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@
#include "utilities/DiskInfoWorker.h"
#include "utilities/GetLockScreenTimeHelper.h"
#include "utilities/GetProtocalHelper.h"
#include "utilities/WorklistFilterHelper.h"
GeneralForm::GeneralForm(QWidget* aParent)
: QWidget(aParent)
@@ -63,8 +64,9 @@ GeneralForm::GeneralForm(QWidget* aParent)
lanHeaderLayout->addWidget(languageLabel);
lanHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
QToolButton* btnLan = new ListBox(lanHeader);
btnLan->setFixedWidth(180);
lanHeaderLayout->addWidget(btnLan);
lanHeaderLayout->addSpacerItem(new QSpacerItem(1220, 20, QSizePolicy::Fixed));
lanHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Lock Screen
QWidget* lockHeader = new QWidget(this);
@@ -74,8 +76,9 @@ GeneralForm::GeneralForm(QWidget* aParent)
lockHeaderLayout->addWidget(lockScreenLabel);
lockHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
ListBox* lockTime = new ListBox(lockHeader);
lockTime->setFixedWidth(180);
lockHeaderLayout->addWidget(lockTime);
lockHeaderLayout->addSpacerItem(new QSpacerItem(1220, 20, QSizePolicy::Fixed));
lockHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Scan Protocol
QWidget* scanProtocolHeader = new QWidget(this);
@@ -86,8 +89,35 @@ GeneralForm::GeneralForm(QWidget* aParent)
scanProtocalHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
ListBox* scanProtocolButton = new ListBox(scanProtocolHeader);
scanProtocolButton->setText(GetProtocalHelper::getProtocalStr());
scanProtocolButton->setFixedWidth(180);
scanProtocalHeaderLayout->addWidget(scanProtocolButton);
scanProtocalHeaderLayout->addSpacerItem(new QSpacerItem(1220, 20, QSizePolicy::Fixed));
scanProtocalHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Worklist Modality Filter
QWidget* worklistModalityFilterHeader = new QWidget(this);
mLayout->addWidget(worklistModalityFilterHeader);
QHBoxLayout* worklistFilterModalityHeaderLayout = new QHBoxLayout(worklistModalityFilterHeader);
QLabel* worklistFilterModalityLabel = new QLabel(tr("Worklist Modality Filter"), this);
worklistFilterModalityHeaderLayout->addWidget(worklistFilterModalityLabel);
worklistFilterModalityHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
ListBox* worklistFilterModalityButton = new ListBox(worklistModalityFilterHeader);
worklistFilterModalityButton->setText(WorklistFilterHelper::getCurrentWorklistFilterModality());
worklistFilterModalityButton->setFixedWidth(180);
worklistFilterModalityHeaderLayout->addWidget(worklistFilterModalityButton);
worklistFilterModalityHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Worklist Date Filter
QWidget* worklistDateFilterHeader = new QWidget(this);
mLayout->addWidget(worklistDateFilterHeader);
QHBoxLayout* worklistFilterDateHeaderLayout = new QHBoxLayout(worklistDateFilterHeader);
QLabel* worklistFilterDateLabel = new QLabel(tr("Worklist Date Filter"), this);
worklistFilterDateHeaderLayout->addWidget(worklistFilterDateLabel);
worklistFilterDateHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
ListBox* worklistFilterDateButton = new ListBox(worklistDateFilterHeader);
worklistFilterDateButton->setFixedWidth(180);
worklistFilterDateButton->setText(WorklistFilterHelper::getCurrentWorklistFilterDate());
worklistFilterDateHeaderLayout->addWidget(worklistFilterDateButton);
worklistFilterDateHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Complete Notify
QWidget* scanCompleteHeader = new QWidget(this);
@@ -100,7 +130,7 @@ GeneralForm::GeneralForm(QWidget* aParent)
scanCompleteHeaderLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
scanCompleteHeaderLayout->addWidget(scanCompleteButton);
scanCompleteButton->setChecked(JsonObject::Instance()->getCompleteNotify());
scanCompleteHeaderLayout->addSpacerItem(new QSpacerItem(1220, 20, QSizePolicy::Fixed));
scanCompleteHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Anonymous
QWidget* anonyHeader = new QWidget(this);
@@ -112,7 +142,7 @@ GeneralForm::GeneralForm(QWidget* aParent)
ImageSwitch* anonyButton = new ImageSwitch(anonyHeader);
anonyButton->setChecked(JsonObject::Instance()->getAnonymousMode());
anonyHeaderLayout->addWidget(anonyButton);
anonyHeaderLayout->addSpacerItem(new QSpacerItem(1220, 20, QSizePolicy::Fixed));
anonyHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//Screen Saver
QWidget* screenSaverHeader = new QWidget(this);
@@ -124,7 +154,7 @@ GeneralForm::GeneralForm(QWidget* aParent)
ImageSwitch* screenSaverButton = new ImageSwitch(screenSaverHeader);
screenSaverButton->setChecked(JsonObject::Instance()->getScreenSaverMode());
screenSaverHeaderLayout->addWidget(screenSaverButton);
screenSaverHeaderLayout->addSpacerItem(new QSpacerItem(1220, 20, QSizePolicy::Fixed));
screenSaverHeaderLayout->addSpacerItem(new QSpacerItem(1000, 20, QSizePolicy::Fixed));
//DiskIcon
QWidget* diskHeader = new QWidget(this);
@@ -209,8 +239,12 @@ GeneralForm::GeneralForm(QWidget* aParent)
anonyLabel->setText(tr("Anonymous Mode"));
screenSaverLabel->setText(tr("Screen Saver"));
diskLabel->setText(tr("Disk Storage"));
worklistFilterDateLabel->setText(tr("Worklist Date Filter"));
worklistFilterModalityLabel->setText(tr("Worklist Modality Filter"));
anonyButton->setChecked(JsonObject::Instance()->getAnonymousMode());
scanProtocolButton->setText(GetProtocalHelper::getProtocalStr());
worklistFilterDateButton->setText(WorklistFilterHelper::getCurrentWorklistFilterDate());
worklistFilterModalityButton->setText(WorklistFilterHelper::getCurrentWorklistFilterModality());
lockTime->setText(GetLockScreenTimeHelper::getLockScreenTimeStr());
updateStorageSize();
updateStorageUsed();
@@ -245,6 +279,31 @@ GeneralForm::GeneralForm(QWidget* aParent)
}
});
connect(worklistFilterModalityButton, &QPushButton::clicked, [=]()
{
DialogResult result = DialogManager::Default()->reuqestWorklistFilterModalityDialog();
if (result.ResultCode == QDialog::Accepted)
{
QString modality = result.ResultData.toString();
worklistFilterModalityButton->setText(modality);
JsonObject::Instance()->setWorklistFilterModality(WorklistFilterHelper::processSelectedWorklistFilterModality(modality));
LOG_USER_OPERATION(QString("Set Worklist Modality Filter:%1").arg(modality));
}
});
connect(worklistFilterDateButton, &QPushButton::clicked, [=]()
{
DialogResult result = DialogManager::Default()->reuqestWorklistFilterDateDialog();
if (result.ResultCode == QDialog::Accepted)
{
QString date = result.ResultData.toString();
worklistFilterDateButton->setText(date);
JsonObject::Instance()->setWorklistFilterDate(date);
JsonObject::Instance()->setWorklistFilterDate(WorklistFilterHelper::processSelectedWorklistFilterDate(date));
LOG_USER_OPERATION(QString("Set Worklist Date Filter:%1").arg(date));
}
});
connect(scanCompleteButton, &ImageSwitch::clicked, [=]()
{
bool isOpen = scanCompleteButton->getChecked();