From afd5694ba03464447260ecca33fa33a300de5d83 Mon Sep 17 00:00:00 2001 From: sunwen Date: Tue, 22 Jul 2025 14:04:39 +0800 Subject: [PATCH 1/2] feat: Fix pacsconfigration dialog display in laptop. --- src/src/PACS/Widget/pacsconfiguration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/src/PACS/Widget/pacsconfiguration.cpp b/src/src/PACS/Widget/pacsconfiguration.cpp index d4f4169..8a6ba9f 100644 --- a/src/src/PACS/Widget/pacsconfiguration.cpp +++ b/src/src/PACS/Widget/pacsconfiguration.cpp @@ -58,7 +58,6 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent) initPacsInfo(); } - ConfigurationDialog::~ConfigurationDialog() { } @@ -66,8 +65,7 @@ ConfigurationDialog::~ConfigurationDialog() void ConfigurationDialog::initUi() { this->setWindowFlags( windowFlags() | Qt::FramelessWindowHint); - this->resize(580, 380); - this->setMinimumSize(QSize(580, 380)); + this->resize(620, 430); this->setObjectName("PacsConfigurationDialog"); m_pMainLayout = new QVBoxLayout(this); @@ -89,7 +87,7 @@ void ConfigurationDialog::initUi() m_pOurInfoLayout->addWidget(m_pOurTitleEdit); m_AdvancedSettingsButton = new QPushButton(m_pOurInfoWidget); m_AdvancedSettingsButton->setText(tr("Advanced settings")); - m_pOurInfoLayout->addWidget(m_AdvancedSettingsButton); + m_pOurInfoLayout->addWidget(m_AdvancedSettingsButton); m_pOurInfoWidget->setLayout(m_pOurInfoLayout); m_pMainLayout->addWidget(m_pOurInfoWidget); @@ -128,6 +126,7 @@ void ConfigurationDialog::initUi() m_pPacsInfo->setSelectionMode(QAbstractItemView::SingleSelection); m_pPacsInfo->setSelectionBehavior(QAbstractItemView::SelectRows); m_pPacsInfo->setModel(m_pPacsModel); + m_pPacsInfo->setMinimumHeight(123); connect(m_pPacsInfo,&QTableView::customContextMenuRequested,this,&ConfigurationDialog::pacsMenuRequest); m_pMainLayout->addWidget(m_pPacsInfo); m_pPacsMenu = new QMenu(m_pPacsInfo); @@ -145,6 +144,7 @@ void ConfigurationDialog::initUi() m_pEditWidget = new QWidget(this); m_pEditLayout = new QGridLayout(this); + m_pEditWidget->setMinimumHeight(63); m_pPeerIpAddressLabel = new QLabel(m_pEditWidget); m_pPeerIpAddressLabel->setText(tr("IP address")); m_pPeerIpAddressLabel->setAlignment(Qt::AlignLeft); From 162eca550110fcc8bd9184f39a2d75485e9cdeb6 Mon Sep 17 00:00:00 2001 From: sunwen Date: Tue, 22 Jul 2025 14:22:27 +0800 Subject: [PATCH 2/2] Fix: Disable search button in pacs search dialog when search button clicked. --- src/src/PACS/Widget/importwidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/src/PACS/Widget/importwidget.cpp b/src/src/PACS/Widget/importwidget.cpp index 8386e1a..629f411 100644 --- a/src/src/PACS/Widget/importwidget.cpp +++ b/src/src/PACS/Widget/importwidget.cpp @@ -361,7 +361,7 @@ void ImportWidget::getDateIntervalForQuery(QString& startDate, QString& endDate) else if(m_pDateComboBox->currentText() == tr("Yesterday")) { startDate_ = date.addDays(-1); - endDate_ = date; + endDate_ = startDate_; } else if (m_pDateComboBox->currentText() == tr("This week")) { @@ -419,6 +419,8 @@ void ImportWidget::getDateIntervalForQuery(QString& startDate, QString& endDate) // if pacs info changed, need reset the info void ImportWidget::query() { + m_pSearchButton->setDisabled(true); + m_pClearButton->setDisabled(true); if (mQueryWorkerThread == nullptr) { mQueryWorkerThread = new QThread; @@ -493,6 +495,8 @@ void ImportWidget::onStudyFoundResult(PACSStudyInfo studyInfo) void ImportWidget::updateStudyView() { + m_pSearchButton->setEnabled(true); + m_pClearButton->setEnabled(true); m_pStudyModel->clear(); m_pStudyModel->setHorizontalHeaderLabels(m_lStudyHeaders); int iRowIdx = 0;