From 36f854dadcb177e86b2e798ad37acddc53c1628b Mon Sep 17 00:00:00 2001 From: Krad Date: Thu, 7 Jul 2022 17:53:58 +0800 Subject: [PATCH] Remove thumbnailClicked from viewcontainerwidget. --- src/src/UI/Widget/thumbnailbarwidget.cpp | 2 +- src/src/UI/Widget/thumbnailbarwidget.h | 2 +- src/src/UI/Widget/viewcontainerwidget.cpp | 20 +++++++------------- src/src/UI/Widget/viewcontainerwidget.h | 7 ------- src/src/UI/Window/QDicomViewer.cpp | 2 +- 5 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/src/UI/Widget/thumbnailbarwidget.cpp b/src/src/UI/Widget/thumbnailbarwidget.cpp index 252ebc5..ce53bd9 100644 --- a/src/src/UI/Widget/thumbnailbarwidget.cpp +++ b/src/src/UI/Widget/thumbnailbarwidget.cpp @@ -203,7 +203,7 @@ void ThumbnailBarWidget::SLot_ThumbClicked(thumbnailImage* thumb) { setCurrentImageLabel(thumb); //SeriesInfo_t* serie_info = thumb->getSeriesInfo(); - emit Signal_ThumbClicked(thumb); + emit Signal_ThumbClicked(thumb->getSeriesInfo()->GetUniqueID()); } diff --git a/src/src/UI/Widget/thumbnailbarwidget.h b/src/src/UI/Widget/thumbnailbarwidget.h index c707708..3db1d50 100644 --- a/src/src/UI/Widget/thumbnailbarwidget.h +++ b/src/src/UI/Widget/thumbnailbarwidget.h @@ -28,7 +28,7 @@ class ThumbnailBarWidget : public QFrame { // void paintEvent(QPaintEvent *)override; signals: - void Signal_ThumbClicked(thumbnailImage* thumb); + void Signal_ThumbClicked(const std::string& uniqueID); public Q_SLOTS: void Slot_setCurrentThumbnail(DicomImageView *view); diff --git a/src/src/UI/Widget/viewcontainerwidget.cpp b/src/src/UI/Widget/viewcontainerwidget.cpp index 30ebd7f..8f7ece9 100644 --- a/src/src/UI/Widget/viewcontainerwidget.cpp +++ b/src/src/UI/Widget/viewcontainerwidget.cpp @@ -25,11 +25,17 @@ ViewContainerWidget::~ViewContainerWidget() { } -//Current view about----------------------------------------------------------- DicomImageView *ViewContainerWidget::getCurrentView() { return mViewManager->getCurrentView(); } +//view layout about------------------------------------------------------------ +DicomImageView *ViewContainerWidget::addNewView() { + DicomImageView *v = new DicomImageView(this); + mViewManager->add(v); + return v; +} + void ViewContainerWidget::viewLayoutChanged(int col, int row) { if (!(col > 0 && row > 0)) { @@ -87,18 +93,6 @@ void ViewContainerWidget::viewLayoutChanged(int col, int row) { } } -void ViewContainerWidget::thumbnailClicked(thumbnailImage *tb) { - auto serie_info = tb->getSeriesInfo(); - mViewManager->viewReload(serie_info->GetUniqueID()); -} - -//view layout about------------------------------------------------------------ -DicomImageView *ViewContainerWidget::addNewView() { - DicomImageView *v = new DicomImageView(this); - mViewManager->add(v); - return v; -} - void ViewContainerWidget::resetLayoutToSingle() { viewLayoutChanged(1, 1); while (mViewManager->getViewCount() > 1) { diff --git a/src/src/UI/Widget/viewcontainerwidget.h b/src/src/UI/Widget/viewcontainerwidget.h index 4ea2fc9..5c8b1f1 100644 --- a/src/src/UI/Widget/viewcontainerwidget.h +++ b/src/src/UI/Widget/viewcontainerwidget.h @@ -46,13 +46,6 @@ public slots: */ void viewLayoutChanged(int col, int row); - /** - * 缩略图点击槽函数,会导致当前选中的view重新load数据 - * @param tb 缩略图对象 - * @return - */ - void thumbnailClicked(thumbnailImage *tb); - private: DicomImageView *addNewView(); diff --git a/src/src/UI/Window/QDicomViewer.cpp b/src/src/UI/Window/QDicomViewer.cpp index 07dfcc2..0900617 100644 --- a/src/src/UI/Window/QDicomViewer.cpp +++ b/src/src/UI/Window/QDicomViewer.cpp @@ -842,7 +842,7 @@ void QDicomViewer::SetupConnections() //通知右侧显示区域,当前有series被点击 connect(ui->thumbnailBar, &ThumbnailBarWidget::Signal_ThumbClicked, - ui->viewContainer, &ViewContainerWidget::thumbnailClicked); + ui->viewContainer->getViewManager(), &ImageViewManager::viewReload); connect(ui->toolBar,&QToolBar::visibilityChanged, this, &QDicomViewer::Slot_ToolbarVisibilityChanged);