From 1f36fc6436c51dc1e38bb33d646894e85174638f Mon Sep 17 00:00:00 2001 From: Krad Date: Fri, 12 Aug 2022 14:44:32 +0800 Subject: [PATCH] Add annotations and referenceLine hide or show functions. --- src/src/UI/Manager/ImageViewManager.cpp | 6 +++--- src/src/UI/Manager/ImageViewManager.h | 2 +- src/src/UI/Widget/ToolBar/DefaultToolBar.cpp | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/src/UI/Manager/ImageViewManager.cpp b/src/src/UI/Manager/ImageViewManager.cpp index 01c367e..3276021 100644 --- a/src/src/UI/Manager/ImageViewManager.cpp +++ b/src/src/UI/Manager/ImageViewManager.cpp @@ -460,11 +460,11 @@ void ImageViewManager::unloadFusion() { } } -void ImageViewManager::switchFusion(bool fusion) { +void ImageViewManager::switchFusion() { if (currentView) { - if (currentView->hasSeries() && currentView->isFusion() && !fusion) { + if (currentView->hasSeries() && currentView->isFusion() ) { unloadFusion(); - } else if (fusion) { + } else { loadFusion(); } } diff --git a/src/src/UI/Manager/ImageViewManager.h b/src/src/UI/Manager/ImageViewManager.h index 72ed533..447be4b 100644 --- a/src/src/UI/Manager/ImageViewManager.h +++ b/src/src/UI/Manager/ImageViewManager.h @@ -98,7 +98,7 @@ public: void loadFusion(); - void switchFusion(bool fusion); + void switchFusion(); int checkSyncAbility(DicomImageView* view); diff --git a/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp b/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp index abfaa78..a9232ff 100644 --- a/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp +++ b/src/src/UI/Widget/ToolBar/DefaultToolBar.cpp @@ -364,14 +364,6 @@ void DefaultToolBar::initFusionButton() { mBtnFusion->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); mBtnFusion->setToolTip(QString("Fusion")); connect(mBtnFusion, &QToolButton::clicked, this, &DefaultToolBar::fusion); - mBtnFusion->setCheckable(true); - QMenu *m = new QMenu(this); - m->addAction(tr("Reset Fusion"), [=](){ - mBtnFusion->setChecked(false); - emit fusion(false); - }); - mBtnFusion->setPopupMode(QToolButton::MenuButtonPopup); - mBtnFusion->setMenu(m); mBtnFusion->setEnabled(false); }