diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp index 2dea5cd..f1baa77 100644 --- a/src/src/QDicomViewer.cpp +++ b/src/src/QDicomViewer.cpp @@ -955,31 +955,16 @@ void QDicomViewer::SetupGridTool(QToolButton* gridBtn) { void QDicomViewer::SetupConnections() { - //connect(ui->action_OpenDicomFile, SIGNAL(triggered()), this, SLOT(OnOpenDicomFile())); - //connect(ui->action_OpenDicomFolder, SIGNAL(triggered()), this, SLOT(OnOpenSeriesFolder())); - //connect(ui->action_ShowMetaData, SIGNAL(triggered()), this, SLOT(OnShowMetaData())); - //connect(ui->action_ExportImage, SIGNAL(triggered()), this, SLOT(OnExportImage())); - //connect(ui->action_ImportImage, SIGNAL(triggered()), this, SLOT(OnImportImage())); - //connect(ui->action_Fusion, SIGNAL(triggered()), this, SLOT(OnFusion())); - //通知左侧的缩略图bar ,当前选中series的变换 - connect(ui->viewContainer, SIGNAL(Signal_NotifyThumbnail(DicomImageView*)), - ui->thumbnailBar, SLOT(Slot_setCurrentThumbnail(DicomImageView*))); + connect(ui->viewContainer,&ViewContainerWidget::Signal_NotifyThumbnail, + ui->thumbnailBar, &ThumbnailBarWidget::Slot_setCurrentThumbnail); //通知右侧显示区域,当前有series被点击 - connect(ui->thumbnailBar, SIGNAL(Signal_ThumbClicked(thumbnailImage*)), - ui->viewContainer, SLOT(Slot_ThumbnailClickEvent(thumbnailImage*))); + connect(ui->thumbnailBar, &ThumbnailBarWidget::Signal_ThumbClicked, + ui->viewContainer, &ViewContainerWidget::Slot_ThumbnailClickEvent); - connect(ui->toolBar, SIGNAL(visibilityChanged(bool)), - this, SLOT(Slot_ToolbarVisibilityChanged(bool))); - - - - //connect(ui->viewContainer, SIGNAL(Signal_NotifyThumbnail(DicomImageView*)), - // ui->vcr_toolbar, SLOT(setImageView(DicomImageView*))); - - //connect(ui->thumbnailBar, SIGNAL(Signal_CopyDicomView(SeriesInfo_t*)), - // this, SLOT(Slot_CopyDicomView(SeriesInfo_t*))); + connect(ui->toolBar, &QToolBar::visibilityChanged, + this, &QDicomViewer::Slot_ToolbarVisibilityChanged); } diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp index a2b0868..fac0b21 100644 --- a/src/src/view/dicomimageview.cpp +++ b/src/src/view/dicomimageview.cpp @@ -664,8 +664,8 @@ void DicomImageView::setDicomImageView(SeriesImageSet *series) //whenver change instance,set scroll value to zero initScrollbar(); - connect(_scrollBar, SIGNAL(valueChanged(int)), this, SLOT(Slot_scrollValueChanged(int))); - connect(this, SIGNAL(Signal_Transformation(TransFormType)), this, SLOT(Slot_UpdateOrienInfo(TransFormType))); + connect(_scrollBar, &QScrollBar::valueChanged, this, &DicomImageView::Slot_scrollValueChanged); + connect(this, &DicomImageView::Signal_Transformation, this, &DicomImageView::Slot_UpdateOrienInfo); } bool DicomImageView::HasSeries() diff --git a/src/src/view/thumbnailbarwidget.cpp b/src/src/view/thumbnailbarwidget.cpp index 346c660..e0092ab 100644 --- a/src/src/view/thumbnailbarwidget.cpp +++ b/src/src/view/thumbnailbarwidget.cpp @@ -157,13 +157,13 @@ thumbnailImage* ThumbnailBarWidget::createThumbnailImage(QWidget *parent, Extend thumbnailImage* t = new thumbnailImage(parent, series_info); //connect(t, &thumbnailImage::Signal_ThumbClicked,this, &ThumbnailBarWidget::SLot_ThumbClicked); - connect(t, SIGNAL(Signal_ThumbClicked(thumbnailImage*)), this, SLOT(SLot_ThumbClicked(thumbnailImage*))); + connect(t, &thumbnailImage::Signal_ThumbClicked, this, &ThumbnailBarWidget::SLot_ThumbClicked); return t; } -//该槽函数未使用 + void ThumbnailBarWidget::Slot_setCurrentThumbnail(DicomImageView *view) { if (view != nullptr)