Make select patient can change to scan page.

This commit is contained in:
sunwen
2024-05-06 13:26:57 +08:00
parent e55a13ccfd
commit 172446f6d3
5 changed files with 21 additions and 8 deletions

View File

@@ -40,6 +40,7 @@ ADD_EVENT_VALUE(DoWorkListSearch)\
ADD_EVENT_VALUE(WarningMessageRaise)\ ADD_EVENT_VALUE(WarningMessageRaise)\
ADD_EVENT_VALUE(ErrorStateActive)\ ADD_EVENT_VALUE(ErrorStateActive)\
ADD_EVENT_VALUE(ErrorStateUnactive)\ ADD_EVENT_VALUE(ErrorStateUnactive)\
ADD_EVENT_VALUE(StartScanProcess)\

View File

@@ -329,8 +329,9 @@ void ScanFormWidget::initEvents()
DialogResult result = DialogManager::Default()->reuqestConfirmStartScan(patientInfo); DialogResult result = DialogManager::Default()->reuqestConfirmStartScan(patientInfo);
if(result.ResultCode == QDialog::Accepted) if(result.ResultCode == QDialog::Accepted)
{ {
mPatInf->setPatientInformation(patientInfo->Copy()); mPatInf->setPatientInformation(patientInfo->Copy());
LOG_USER_OPERATION(QString("Select Patient, ID: %1").arg(patientInfo->ID))
EventCenter::Default()->triggerEvent(StartScanProcess, nullptr, patientInfo);
} }
// mBtnScan->setEnabled(true); // mBtnScan->setEnabled(true);

View File

@@ -77,6 +77,12 @@ SelectFormWidget::SelectFormWidget(QWidget* parent)
connect(EventCenter::Default(), &EventCenter::AnonymousModeChanged, this, &SelectFormWidget::updateDataByAnonymousMode); connect(EventCenter::Default(), &EventCenter::AnonymousModeChanged, this, &SelectFormWidget::updateDataByAnonymousMode);
connect(EventCenter::Default(), &EventCenter::StartScanProcess, this, [=](QObject* sender, QObject* data)
{
PatientInformation* patientInfo = (PatientInformation*)data;
this->setSelectedPatient(patientInfo);
});
//first prepare buttons! //first prepare buttons!
prepareButtons(false); prepareButtons(false);
@@ -176,8 +182,11 @@ void SelectFormWidget::delPatient() {
void SelectFormWidget::selectPatient() { void SelectFormWidget::selectPatient() {
EventCenter::Default()->triggerEvent(PatientSelected, nullptr, (QObject*)patientDetailForm->getPatientInformation()); EventCenter::Default()->triggerEvent(PatientSelected, nullptr, (QObject*)patientDetailForm->getPatientInformation());
selectedPatientUID = patientDetailForm->getPatientInformation()->PatientUID; }
LOG_USER_OPERATION(QString("Select Patient, ID: %1").arg(patientDetailForm->getPatientInformation()->ID))
void SelectFormWidget::setSelectedPatient(PatientInformation* aPatient)
{
selectedPatientUID = aPatient->PatientUID;
} }
void SelectFormWidget::initDetailPanel(QHBoxLayout *contentLayout) {// prepare edit panel void SelectFormWidget::initDetailPanel(QHBoxLayout *contentLayout) {// prepare edit panel

View File

@@ -43,6 +43,8 @@ private:
void selectPatient(); void selectPatient();
void setSelectedPatient(PatientInformation* aPatient);
void initDataModel(); void initDataModel();
void initDetailPanel(QHBoxLayout *contentLayout); void initDetailPanel(QHBoxLayout *contentLayout);

View File

@@ -153,18 +153,18 @@ void MainWindow::initializeTabWidget()
mTabWidget->setContentsMargins(0, 0, 0, 0); mTabWidget->setContentsMargins(0, 0, 0, 0);
auto verifyForm = new ReconFormWidget(this); auto verifyForm = new ReconFormWidget(this);
mTabWidget->insertTab(0,verifyForm, tr("Recon")); mTabWidget->insertTab(0,verifyForm, tr("Recon"));
auto scanForm = new ScanFormWidget(this);
mTabWidget->insertTab(0,scanForm, tr("Scan"));
auto selectForm = new SelectFormWidget(this); auto selectForm = new SelectFormWidget(this);
mTabWidget->insertTab(0,selectForm, tr("Select")); mTabWidget->insertTab(0,selectForm, tr("Select"));
auto scanForm = new ScanFormWidget(this);
mTabWidget->insertTab(0,scanForm, tr("Scan"));
mAdminTabIndex+=3; mAdminTabIndex+=3;
mTabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); mTabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
} }
void MainWindow::reloadLanguage() { void MainWindow::reloadLanguage() {
mTabWidget->setTabText(0, tr("Select")); mTabWidget->setTabText(0, tr("Scan"));
mTabWidget->setTabText(1, tr("Scan")); mTabWidget->setTabText(1, tr("Select"));
mTabWidget->setTabText(2, tr("Recon")); mTabWidget->setTabText(2, tr("Recon"));
mTabWidget->setTabText(3, tr("Settings")); mTabWidget->setTabText(3, tr("Settings"));
} }
@@ -181,7 +181,7 @@ void MainWindow::processShutdownDmsFailed()
} }
void MainWindow::switchToScanTab(QObject* sender, QObject* data) { void MainWindow::switchToScanTab(QObject* sender, QObject* data) {
if (data)mTabWidget->setCurrentIndex(1); if (data)mTabWidget->setCurrentIndex(0);
} }
void MainWindow::centerWidgetHide() void MainWindow::centerWidgetHide()