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

Merge branch 'dev' of http://192.168.1.9:3000/Bug/DCMV into dev

Browse Source
This commit is contained in:
kradchen
2025-07-23 13:42:56 +08:00
parent 713eb42088 162eca5501
commit 4ac9aa6fd9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/src/PACS/Widget/importwidget.cpp
View File

@@ -361,7 +361,7 @@ void ImportWidget::getDateIntervalForQuery(QString& startDate, QString& endDate)
else if(m_pDateComboBox->currentText() == tr("Yesterday")) else if(m_pDateComboBox->currentText() == tr("Yesterday"))
{ {
startDate_ = date.addDays(-1); startDate_ = date.addDays(-1);
endDate_ = date; endDate_ = startDate_;
} }
else if (m_pDateComboBox->currentText() == tr("This week")) 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 // if pacs info changed, need reset the info
void ImportWidget::query() void ImportWidget::query()
{ {
m_pSearchButton->setDisabled(true);
m_pClearButton->setDisabled(true);
if (mQueryWorkerThread == nullptr) if (mQueryWorkerThread == nullptr)
{ {
mQueryWorkerThread = new QThread; mQueryWorkerThread = new QThread;
@@ -493,6 +495,8 @@ void ImportWidget::onStudyFoundResult(PACSStudyInfo studyInfo)
void ImportWidget::updateStudyView() void ImportWidget::updateStudyView()
{ {
m_pSearchButton->setEnabled(true);
m_pClearButton->setEnabled(true);
m_pStudyModel->clear(); m_pStudyModel->clear();
m_pStudyModel->setHorizontalHeaderLabels(m_lStudyHeaders); m_pStudyModel->setHorizontalHeaderLabels(m_lStudyHeaders);
int iRowIdx = 0; int iRowIdx = 0;

8
src/src/PACS/Widget/pacsconfiguration.cpp
View File

@@ -58,7 +58,6 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent)
initPacsInfo(); initPacsInfo();
} }
ConfigurationDialog::~ConfigurationDialog() ConfigurationDialog::~ConfigurationDialog()
{ {
} }
@@ -66,8 +65,7 @@ ConfigurationDialog::~ConfigurationDialog()
void ConfigurationDialog::initUi() void ConfigurationDialog::initUi()
{ {
this->setWindowFlags( windowFlags() | Qt::FramelessWindowHint); this->setWindowFlags( windowFlags() | Qt::FramelessWindowHint);
this->resize(580, 380); this->resize(620, 430);
this->setMinimumSize(QSize(580, 380));
this->setObjectName("PacsConfigurationDialog"); this->setObjectName("PacsConfigurationDialog");
m_pMainLayout = new QVBoxLayout(this); m_pMainLayout = new QVBoxLayout(this);
@@ -89,7 +87,7 @@ void ConfigurationDialog::initUi()
m_pOurInfoLayout->addWidget(m_pOurTitleEdit); m_pOurInfoLayout->addWidget(m_pOurTitleEdit);
m_AdvancedSettingsButton = new QPushButton(m_pOurInfoWidget); m_AdvancedSettingsButton = new QPushButton(m_pOurInfoWidget);
m_AdvancedSettingsButton->setText(tr("Advanced settings")); m_AdvancedSettingsButton->setText(tr("Advanced settings"));
m_pOurInfoLayout->addWidget(m_AdvancedSettingsButton); m_pOurInfoLayout->addWidget(m_AdvancedSettingsButton);
m_pOurInfoWidget->setLayout(m_pOurInfoLayout); m_pOurInfoWidget->setLayout(m_pOurInfoLayout);
m_pMainLayout->addWidget(m_pOurInfoWidget); m_pMainLayout->addWidget(m_pOurInfoWidget);
@@ -128,6 +126,7 @@ void ConfigurationDialog::initUi()
m_pPacsInfo->setSelectionMode(QAbstractItemView::SingleSelection); m_pPacsInfo->setSelectionMode(QAbstractItemView::SingleSelection);
m_pPacsInfo->setSelectionBehavior(QAbstractItemView::SelectRows); m_pPacsInfo->setSelectionBehavior(QAbstractItemView::SelectRows);
m_pPacsInfo->setModel(m_pPacsModel); m_pPacsInfo->setModel(m_pPacsModel);
m_pPacsInfo->setMinimumHeight(123);
connect(m_pPacsInfo,&QTableView::customContextMenuRequested,this,&ConfigurationDialog::pacsMenuRequest); connect(m_pPacsInfo,&QTableView::customContextMenuRequested,this,&ConfigurationDialog::pacsMenuRequest);
m_pMainLayout->addWidget(m_pPacsInfo); m_pMainLayout->addWidget(m_pPacsInfo);
m_pPacsMenu = new QMenu(m_pPacsInfo); m_pPacsMenu = new QMenu(m_pPacsInfo);
@@ -145,6 +144,7 @@ void ConfigurationDialog::initUi()
m_pEditWidget = new QWidget(this); m_pEditWidget = new QWidget(this);
m_pEditLayout = new QGridLayout(this); m_pEditLayout = new QGridLayout(this);
m_pEditWidget->setMinimumHeight(63);
m_pPeerIpAddressLabel = new QLabel(m_pEditWidget); m_pPeerIpAddressLabel = new QLabel(m_pEditWidget);
m_pPeerIpAddressLabel->setText(tr("IP address")); m_pPeerIpAddressLabel->setText(tr("IP address"));
m_pPeerIpAddressLabel->setAlignment(Qt::AlignLeft); m_pPeerIpAddressLabel->setAlignment(Qt::AlignLeft);