diff --git a/src/forms/scan/ScanFormWidget.cpp b/src/forms/scan/ScanFormWidget.cpp index 9f3d9e3..af4a5f4 100644 --- a/src/forms/scan/ScanFormWidget.cpp +++ b/src/forms/scan/ScanFormWidget.cpp @@ -44,10 +44,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) { lbl_Protocol->setAlignment(Qt::AlignTop); lbl_Protocol->setObjectName("lbl_protocol"); layout->addWidget(lbl_Protocol); - QWidget* spacerLine = new QWidget(this); - spacerLine->setFixedWidth(2); - spacerLine->setObjectName("verSpaceLine"); - layout->addWidget(spacerLine); + addVerticalLine(layout); ADD_TOOL_BTN(Left, ":/icons/left.png"); ADD_TOOL_BTN(Right, ":/icons/right.png"); btnLeft->setText(tr("LEFT")); @@ -60,10 +57,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) { group->addButton(btnRight, 1); group->addButton(btnLeft, 0); layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); - QWidget* spacerLine2 = new QWidget(this); - spacerLine2->setFixedWidth(2); - spacerLine2->setObjectName("verSpaceLine"); - layout->addWidget(spacerLine2); + addVerticalLine(layout); ADD_TOOL_BTN(Refresh, ":/icons/scan_e.png"); ADD_TOOL_BTN(Preview, ":/icons/rec.png"); diff --git a/src/forms/select/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp index 2540a46..2c507b5 100644 --- a/src/forms/select/SelectFormWidget.cpp +++ b/src/forms/select/SelectFormWidget.cpp @@ -3,57 +3,59 @@ // #include "ui_tabformwidget.h" #include "SelectFormWidget.h" + #include #include #include -#include "components/SlideTableView.h" +#include #include #include #include +#include + +#include "components/SlideTableView.h" #include "db/SQLHelper.h" #include "guimacros.h" #include "event/EventCenter.h" -#include "src/dialogs/AccountFormDialog.h" -#include -#include "log/UserOperationLog.h" -#include "src/components/VerticalTextToolButton.h" +#include "dialogs/AccountFormDialog.h" #include "dialogs/AlertDialog.h" +#include "log/UserOperationLog.h" +#include "components/VerticalTextToolButton.h" -#include - - - -SelectFormWidget::SelectFormWidget(QWidget* parent) : - TabFormWidget(parent) +SelectFormWidget::SelectFormWidget(QWidget* parent) +: TabFormWidget(parent) +, mBtnAccount(new QToolButton(this)) +, mBtnWorklist(new QToolButton(this)) +, mBtnAdd(new QToolButton(this)) +, mBtnEdit(new QToolButton(this)) +, mBtnDelete(new QToolButton(this)) +, mBtnSelect(new QToolButton(this)) { //init command bar - QHBoxLayout* layout = new QHBoxLayout(); + auto layout = new QHBoxLayout(); ui->commandWidget->setLayout(layout); - ADD_TOOL_BTN(Account, ":/icons/account.png"); - ADD_TOOL_BTN(Worklist, ":/icons/setting.png"); - btnAccount->setText(tr("Account")); - btnWorklist->setText(tr("Worklist")); + INIT_TOOL_BTN(Account, ":/icons/account.png") + INIT_TOOL_BTN(Worklist, ":/icons/setting.png") + mBtnAccount->setText(tr("Account")); + mBtnWorklist->setText(tr("Worklist")); layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding)); - QWidget* spacerLine = new QWidget(this); - spacerLine->setFixedWidth(2); - spacerLine->setObjectName("verSpaceLine"); - layout->addWidget(spacerLine); - ADD_TOOL_BTN(Add, ":/icons/add.png"); - ADD_TOOL_BTN(Edit, ":/icons/details.png"); - ADD_TOOL_BTN(Delete, ":/icons/close_circle.png"); - ADD_TOOL_BTN(Select, ":/icons/selected.png"); - btnAdd->setText(tr("Add")); - btnEdit->setText(tr("Edit")); - btnDelete->setText(tr("Delete")); - btnSelect->setText(tr("Select")); + addVerticalLine(layout); + INIT_TOOL_BTN(Add, ":/icons/add.png") + INIT_TOOL_BTN(Edit, ":/icons/details.png") + INIT_TOOL_BTN(Delete, ":/icons/close_circle.png") + INIT_TOOL_BTN(Select, ":/icons/selected.png") + mBtnAdd->setText(tr("Add")); + mBtnEdit->setText(tr("Edit")); + mBtnDelete->setText(tr("Delete")); + mBtnSelect->setText(tr("Select")); //Init content widget - QHBoxLayout* contentLayout = new QHBoxLayout(); + auto* contentLayout = new QHBoxLayout(); contentLayout->setContentsMargins(5, 5, 0, 5); this->ui->contentWidget->setLayout(contentLayout); // TableView for patient - SlideTableView* table = new SlideTableView(this); + auto table = new SlideTableView(this); table->setAlternatingRowColors(true); table->setSelectionMode(QAbstractItemView::SingleSelection); table->setEditTriggers(QAbstractItemView::NoEditTriggers); @@ -88,12 +90,9 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : table->setColumnWidth(4, 120); table->setColumnWidth(5, 250); contentLayout->addWidget(table); - QWidget* spacerLine2 = new QWidget(this); - spacerLine2->setFixedWidth(2); - spacerLine2->setObjectName("verSpaceLine"); - contentLayout->addWidget(spacerLine2); + addVerticalLine(layout); // prepare edit panel - EditPatientForm* edit_patient = new EditPatientForm(this); + auto edit_patient = new EditPatientForm(this); edit_patient->setObjectName("edit_patient"); edit_patient->hide(); contentLayout->addWidget(edit_patient); @@ -128,10 +127,10 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : //prepare button state auto prepareButtons = [=](bool disableALL){ bool state_flag = (table->currentIndex().row()>=0); - btnSelect->setEnabled(state_flag && !disableALL); - btnDelete->setEnabled(state_flag && !disableALL); - btnEdit->setEnabled(state_flag && !disableALL); - btnAdd->setEnabled(!disableALL); + mBtnSelect->setEnabled(state_flag && !disableALL); + mBtnDelete->setEnabled(state_flag && !disableALL); + mBtnEdit->setEnabled(state_flag && !disableALL); + mBtnAdd->setEnabled(!disableALL); }; //table current row selection changing event connect(table, &SlideTableView::currentRowChanged, [=](int row) { @@ -150,7 +149,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : }); // btn add slot - connect(btnAdd, &QToolButton::clicked, [=]() { + connect(mBtnAdd, &QToolButton::clicked, [=]() { EditPatientDialog dialog(this); dialog.clearPatientInformation(); dialog.setWindowModality(Qt::WindowModal); @@ -160,13 +159,13 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : table->selectRow(0); model->selectRow(0); LOG_USER_OPERATION(AddPatient) - btnSelect->setEnabled(true); + mBtnSelect->setEnabled(true); } }); - // btn edit slot - connect(btnEdit, &QToolButton::clicked, [=]() { + // mBtn edit slot + connect(mBtnEdit, &QToolButton::clicked, [=]() { EditPatientDialog dialog(this); dialog.setPatientInformation(edit_patient->getPatientInformation()); dialog.setWindowModality(Qt::WindowModal); @@ -175,15 +174,15 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : if (dialog.exec() == QDialog::Accepted) { table->clicked(table->currentIndex()); setPatientDetail(table, model, edit_patient); - LOG_USER_OPERATION(AddPatient); - btnSelect->setEnabled(true); + LOG_USER_OPERATION(AddPatient) + mBtnSelect->setEnabled(true); } }); - // btn add slot + // mBtn add slot connect(edit_patient, &EditPatientForm::editCancel, [=]() { if (table->currentIndex().row()<0) return; - btnSelect->setEnabled(true); + mBtnSelect->setEnabled(true); }); // EditPatientForm editAccept slot @@ -217,11 +216,11 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : { LOG_USER_OPERATION(ChangePatientInfo) } - btnSelect->setEnabled(true); + mBtnSelect->setEnabled(true); }); // btn delete slot - connect(btnDelete, &QToolButton::clicked, [=]() { + connect(mBtnDelete, &QToolButton::clicked, [=]() { if (table->currentIndex().row()<0) return; AlertDialog dialog(this); dialog.setWindowModality(Qt::WindowModal); @@ -263,16 +262,16 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : }); - // btn select slot - connect(btnSelect, &QToolButton::clicked, [=]() { + // mBtn select slot + connect(mBtnSelect, &QToolButton::clicked, [=]() { EventCenter::Default()->triggerEvent(GUIEvents::PatientSelected, nullptr, edit_patient->getPatientInformation()->Copy()); selectedPatientUID = edit_patient->getPatientInformation()->PatientUID; LOG_USER_OPERATION(SelectPatient) }); - // btn account slot - connect(btnAccount, &QToolButton::clicked, [=]() { + // mBtn account slot + connect(mBtnAccount, &QToolButton::clicked, [=]() { AccountFormDialog dia(this); dia.setWindowModality(Qt::WindowModal); dia.exec(); @@ -298,12 +297,12 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) : model->setHeaderData(5, Qt::Horizontal, tr("Add Date")); model->setHeaderData(6, Qt::Horizontal, tr("Comment")); - btnAccount->setText(tr("Account")); - //btnWorklist->setText(tr("Worklist")); - btnAdd->setText(tr("Add")); - btnEdit->setText(tr("Edit")); - btnDelete->setText(tr("Delete")); - btnSelect->setText(tr("Select")); + mBtnAccount->setText(tr("Account")); + //mBtnWorklist->setText(tr("Worklist")); + mBtnAdd->setText(tr("Add")); + mBtnEdit->setText(tr("Edit")); + mBtnDelete->setText(tr("Delete")); + mBtnSelect->setText(tr("Select")); }); //first prepare buttons! @@ -321,9 +320,4 @@ void SelectFormWidget::setPatientDetail(const SlideTableView *table, const QSqlT } -SelectFormWidget::~SelectFormWidget() -{ - -} - diff --git a/src/forms/select/SelectFormWidget.h b/src/forms/select/SelectFormWidget.h index bf2d93f..f092986 100644 --- a/src/forms/select/SelectFormWidget.h +++ b/src/forms/select/SelectFormWidget.h @@ -10,17 +10,22 @@ #include "EditPatientDialog.h" class EditPatientForm; class SlideTableView; +class QToolButton; class SelectFormWidget: public TabFormWidget { Q_OBJECT public: explicit SelectFormWidget(QWidget *parent = nullptr); - ~SelectFormWidget(); + ~SelectFormWidget() override = default;; private: QString selectedPatientUID; - - void - setPatientDetail(const SlideTableView *table, const QSqlTableModel *model, EditPatientForm *edit_patient) const; + void setPatientDetail(const SlideTableView *table, const QSqlTableModel *model, EditPatientForm *edit_patient) const; + QToolButton* mBtnAccount; + QToolButton* mBtnWorklist; + QToolButton* mBtnAdd; + QToolButton* mBtnEdit; + QToolButton* mBtnDelete; + QToolButton* mBtnSelect; }; diff --git a/src/forms/settings/AdminSettingForm.cpp b/src/forms/settings/AdminSettingForm.cpp index f11541f..0e3351d 100644 --- a/src/forms/settings/AdminSettingForm.cpp +++ b/src/forms/settings/AdminSettingForm.cpp @@ -19,7 +19,7 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm QHBoxLayout* layout = new QHBoxLayout(this); layout->setMargin(0); - layout->setContentsMargins(0, 8, 0, 1); + layout->setContentsMargins(0, 8, 0, 8); this->ui->contentWidget->setLayout(layout); this->ui->contentWidget->setObjectName("contentWidgetWithBBorder"); QListWidget* widget = new QListWidget(this); @@ -35,11 +35,7 @@ AdminSettingForm::AdminSettingForm(QWidget* parent, Qt::WindowFlags f) : TabForm layout->addWidget(widget); QStackedWidget* stackedWidget = new QStackedWidget(this); - QWidget* spacerLine2 = new QWidget(this); - spacerLine2->setFixedWidth(2); - spacerLine2->setObjectName("verSpaceLine"); - spacerLine2->setStyleSheet("margin-bottom:8px"); - layout->addWidget(spacerLine2); + addVerticalLine(layout); layout->addWidget(stackedWidget); this->ui->commandWidget->hide(); diff --git a/src/forms/tabformwidget.cpp b/src/forms/tabformwidget.cpp index 2e294d5..d4992b0 100644 --- a/src/forms/tabformwidget.cpp +++ b/src/forms/tabformwidget.cpp @@ -20,3 +20,10 @@ TabFormWidget::~TabFormWidget() { delete ui; } + +void TabFormWidget::addVerticalLine(QHBoxLayout *layout) { + auto spacerLine = new QWidget(this); + spacerLine->setFixedWidth(2); + spacerLine->setObjectName("verSpaceLine"); + layout->addWidget(spacerLine); +} diff --git a/src/forms/tabformwidget.h b/src/forms/tabformwidget.h index 4b61449..6fc38fd 100644 --- a/src/forms/tabformwidget.h +++ b/src/forms/tabformwidget.h @@ -6,7 +6,7 @@ namespace Ui { class TabFormWidget; } - +class QHBoxLayout; class TabFormWidget : public QWidget { Q_OBJECT @@ -16,6 +16,7 @@ public: ~TabFormWidget(); protected: Ui::TabFormWidget *ui; + void addVerticalLine(QHBoxLayout *layout); }; #endif // TABFORMWIDGET_H