diff --git a/src/forms/select/PatientInformation.h b/src/forms/select/PatientInformation.h index fa3bb5a..9a0f02f 100644 --- a/src/forms/select/PatientInformation.h +++ b/src/forms/select/PatientInformation.h @@ -1,21 +1,30 @@ #ifndef GUI_PATIENTINFORMATION_H #define GUI_PATIENTINFORMATION_H -#define ADD_PATIENT()\ +#define EDIT_PATIENT()\ +ADD_PATIENT_PROPERTY(PatientUID)\ ADD_PATIENT_PROPERTY(ID)\ ADD_PATIENT_PROPERTY(AccessionNumber)\ ADD_PATIENT_PROPERTY(Name)\ ADD_PATIENT_PROPERTY(BirthDate)\ ADD_PATIENT_PROPERTY(Sex)\ ADD_PATIENT_PROPERTY(AddDate)\ + + +#define ADD_PATIENT()\ +EDIT_PATIENT()\ +ADD_PATIENT_PROPERTY(StudyUID)\ +ADD_PATIENT_PROPERTY(RPID)\ +ADD_PATIENT_PROPERTY(SPSID)\ +ADD_PATIENT_PROPERTY(Modality)\ +ADD_PATIENT_PROPERTY(MPPSUID)\ ADD_PATIENT_PROPERTY(Comment) -#define EDIT_PATIENT()\ -ADD_PATIENT_PROPERTY(PatientUID)\ -ADD_PATIENT() + + enum PatientInformationEnum{ #define ADD_PATIENT_PROPERTY(val) val, - EDIT_PATIENT() + ADD_PATIENT() #undef ADD_PATIENT_PROPERTY }; @@ -31,7 +40,7 @@ class PatientInformation:public QObject{ Q_OBJECT public: #define ADD_PATIENT_PROPERTY(val) QString val; - EDIT_PATIENT() + ADD_PATIENT() #undef ADD_PATIENT_PROPERTY PatientInformation() : QObject() diff --git a/src/forms/select/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp index b0b05cc..248b7aa 100644 --- a/src/forms/select/SelectFormWidget.cpp +++ b/src/forms/select/SelectFormWidget.cpp @@ -210,6 +210,13 @@ void SelectFormWidget::initTableView(QLayout *contentLayout) mPatTable->setSortingEnabled(true); // enable sortingEnabled mPatTable->setModel((QAbstractItemModel*) mModel); mPatTable->hideColumn(0); + mPatTable->hideColumn(7); + mPatTable->hideColumn(8); + mPatTable->hideColumn(9); + mPatTable->hideColumn(10); + mPatTable->hideColumn(11); + mPatTable->hideColumn(12); + mPatTable->show(); mPatTable->setColumnWidth(1, 250); @@ -218,7 +225,6 @@ void SelectFormWidget::initTableView(QLayout *contentLayout) mPatTable->setColumnWidth(4, 120); mPatTable->setColumnWidth(5, 80); mPatTable->setColumnWidth(6, 120); - mPatTable->setColumnHidden(7, true); contentLayout->addWidget(mPatTable); //table current row selection changing event connect(mPatTable, &SlideTableView::currentRowChanged, [=](int row) {