From 772b50a6a5317dece5c9e8087328ba7b1bc34490 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 25 Feb 2022 13:21:18 +0800
Subject: [PATCH] Refactor QDicomViewer change drawdicom to openAndDrawDICOM

---
 src/include/QDicomViewer.h |  2 +-
 src/src/QDicomViewer.cpp   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/include/QDicomViewer.h b/src/include/QDicomViewer.h
index 48583cc..4866b5b 100644
--- a/src/include/QDicomViewer.h
+++ b/src/include/QDicomViewer.h
@@ -80,7 +80,7 @@ private:
 	 * @param dicomName DICOM文件路径
 	 * @param openMode 文件打开方式，文件方式或文件夹方式
 	 */
-	void drawDICOM(const std::string &dicomName, SeriesOpenMode openMode);
+	void openAndDrawDICOM(const std::string &dicomName, SeriesOpenMode openMode);
 
 	/**
 	 * 设置部分空间的槽函数连接
diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp
index 81f956d..2fe105e 100644
--- a/src/src/QDicomViewer.cpp
+++ b/src/src/QDicomViewer.cpp
@@ -1,4 +1,4 @@
-#include "QDicomViewer.h"
+#include "QDicomViewer.h"
 #include "global/include_all.h"
 #include "base/seriesinstance.h"
 #include "view/subview/gridpopwidget.h"
@@ -853,7 +853,7 @@ void QDicomViewer::SetupFileTool(QToolButton* fileBtn) {
 		QString p = QFileDialog::getExistingDirectory(this, tr("Open dicom directory"), m_qs.value("DIR_PATH_ID").toString());
 		if (!p.isEmpty()) {
 			m_qs.setValue("DIR_PATH_ID", p);
-			drawDICOM(p.toStdString(), DIR_OPEN_MODE);
+            openAndDrawDICOM(p.toStdString(), DIR_OPEN_MODE);
 		}
 		});
 
@@ -863,7 +863,7 @@ void QDicomViewer::SetupFileTool(QToolButton* fileBtn) {
 		QString fn = QFileDialog::getOpenFileName(this, tr("Open dicom files"), m_qs.value("FILE_PATH_ID").toString());
 		if (!fn.isEmpty()) {
 			m_qs.setValue("FILE_PATH_ID", fn);
-			drawDICOM(fn.toStdString(), FILE_OPEN_MODE);
+            openAndDrawDICOM(fn.toStdString(), FILE_OPEN_MODE);
 		}
 		});
 
@@ -884,7 +884,7 @@ void QDicomViewer::SetupFileTool(QToolButton* fileBtn) {
 		if (!p.isEmpty()) {
 			m_qs.setValue("DIR_PATH_ID", p);
 			//ui->thumbnailBar_->setImagePaths(QStringList() << p);
-			drawDICOM(p.toStdString(), DIR_OPEN_MODE);
+            openAndDrawDICOM(p.toStdString(), DIR_OPEN_MODE);
 		}
 		});
 }
@@ -962,9 +962,11 @@ void QDicomViewer::SetupConnections()
 	//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*)));
 
+	//通知右侧显示区域，当前有series被点击
 	connect(ui->thumbnailBar, SIGNAL(Signal_ThumbClicked(thumbnailImage*)),
 		ui->viewContainer, SLOT(Slot_ThumbnailClickEvent(thumbnailImage*)));
 
@@ -990,7 +992,7 @@ void QDicomViewer::Slot_ToolbarVisibilityChanged(bool visible)
 void QDicomViewer::openDICOMFromPACS(int err, std::string dirName)
 {
 	if (err == NOERROR) {
-		drawDICOM(dirName, DIR_OPEN_MODE);
+        openAndDrawDICOM(dirName, DIR_OPEN_MODE);
 	}
 	else
 	{
@@ -999,7 +1001,7 @@ void QDicomViewer::openDICOMFromPACS(int err, std::string dirName)
 	}
 }
 
-void QDicomViewer::drawDICOM(const std::string& dicomName, SeriesOpenMode openMode)
+void QDicomViewer::openAndDrawDICOM(const std::string& dicomName, SeriesOpenMode openMode)
 {
 
 	displayThumbnailBar(true);