diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp index f1baa77..4c920b9 100644 --- a/src/src/QDicomViewer.cpp +++ b/src/src/QDicomViewer.cpp @@ -956,15 +956,23 @@ void QDicomViewer::SetupGridTool(QToolButton* gridBtn) { void QDicomViewer::SetupConnections() { //通知左侧的缩略图bar ,当前选中series的变换 - connect(ui->viewContainer,&ViewContainerWidget::Signal_NotifyThumbnail, + connect(ui->viewContainer, &ViewContainerWidget::Signal_NotifyThumbnail, ui->thumbnailBar, &ThumbnailBarWidget::Slot_setCurrentThumbnail); //通知右侧显示区域,当前有series被点击 connect(ui->thumbnailBar, &ThumbnailBarWidget::Signal_ThumbClicked, ui->viewContainer, &ViewContainerWidget::Slot_ThumbnailClickEvent); - connect(ui->toolBar, &QToolBar::visibilityChanged, + connect(ui->toolBar,&QToolBar::visibilityChanged, this, &QDicomViewer::Slot_ToolbarVisibilityChanged); + + + + //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*))); } diff --git a/src/src/QDicomViewer.h b/src/src/QDicomViewer.h index e3ed4a4..e3f9974 100644 --- a/src/src/QDicomViewer.h +++ b/src/src/QDicomViewer.h @@ -28,14 +28,16 @@ private: Ui::QDicomViewerClass *ui; /** - * 从qrc中读取指定抿成的StyleSheet文件 + * 从qrc中读取指定名称的StyleSheet文件 * @param sheetName StyleSheet文件名 */ void loadStyleSheet(const QString &sheetName); + /** * 初始化函数,主要实现了Button的构建和槽函数绑定 */ void Initial(); + void createToolButton(); /** diff --git a/src/src/view/thumbnailbarwidget.cpp b/src/src/view/thumbnailbarwidget.cpp index e0092ab..929b898 100644 --- a/src/src/view/thumbnailbarwidget.cpp +++ b/src/src/view/thumbnailbarwidget.cpp @@ -1,5 +1,4 @@ #include "view/thumbnailbarwidget.h" -#include "view/thumbnailImage.h" #include "base/DicomLoader.h" #include "base/SeriesImageSet.h" #include diff --git a/src/src/view/thumbnailbarwidget.h b/src/src/view/thumbnailbarwidget.h index 0ad20b2..748b32d 100644 --- a/src/src/view/thumbnailbarwidget.h +++ b/src/src/view/thumbnailbarwidget.h @@ -8,10 +8,9 @@ #include #include "global/QGlobals.h" #include "QScrollArea.h" +#include "view/thumbnailImage.h" -class ImageInstance; class SeriesImageSet; -class thumbnailImage; class DicomImageView; class ThumbnailBarWidget : public QFrame { @@ -28,7 +27,7 @@ class ThumbnailBarWidget : public QFrame { //protected: // void paintEvent(QPaintEvent *)override; - Q_SIGNALS: +signals: void Signal_ThumbClicked(thumbnailImage* thumb); public Q_SLOTS: diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp index 1559c0e..dd742c8 100644 --- a/src/src/view/viewcontainerwidget.cpp +++ b/src/src/view/viewcontainerwidget.cpp @@ -225,8 +225,6 @@ void ViewContainerWidget::setCurrentView(DicomImageView *view) { * 双击 view(放大缩小) * @param view */ - - void ViewContainerWidget::Slot_ViewDoubleClicked(DicomImageView *view) { if (!view) { return; @@ -257,9 +255,6 @@ void ViewContainerWidget::Slot_ViewDoubleClicked(DicomImageView *view) { * @param col * @param row */ - - - void ViewContainerWidget::Slot_SetViewLayout(int col, int row) { if (!(col > 0 && row > 0)) {