From b6752d4c1a7a46396c631c5956c798ed810ba5a1 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 15 Apr 2022 09:12:56 +0800
Subject: [PATCH] Change seriesNumber to seriesName.

---
 src/src/base/SeriesImageSet.cpp | 18 ++++++++++++++----
 src/src/base/SeriesImageSet.h   | 13 +++++--------
 src/src/export/exportdialog.cpp |  4 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/src/base/SeriesImageSet.cpp b/src/src/base/SeriesImageSet.cpp
index d8c0ead..cbb6ac2 100644
--- a/src/src/base/SeriesImageSet.cpp
+++ b/src/src/base/SeriesImageSet.cpp
@@ -37,8 +37,18 @@ const char* SeriesImageSet::getCurImageName() const
 	return nullptr;
 }
 
-const char* SeriesImageSet::getCurSeriesName() const
-{
+const char* SeriesImageSet::getSeriesName() const{
     if (!m_property) return nullptr;
-    return m_property->GetSeriesNumber();
-}
\ No newline at end of file
+    return m_property->GetSeriesUID();
+}
+
+long SeriesImageSet::GetSeriesNumber() const
+{
+    if (!m_property) return -1L;
+    return m_property->GetSeriesNumberAsLong();
+}
+
+const char *SeriesImageSet::getStudyUID() const {
+    if (!m_property) return nullptr;
+    return m_property->GetStudyUID();
+}
diff --git a/src/src/base/SeriesImageSet.h b/src/src/base/SeriesImageSet.h
index 4210769..d88d0fc 100644
--- a/src/src/base/SeriesImageSet.h
+++ b/src/src/base/SeriesImageSet.h
@@ -21,18 +21,15 @@ public:
 	std::string const & getUniqueID()  {
 		return m_pUniqueID;
 	};
-	const char* getCurImageName()const;
-	const char* getCurSeriesName() const;
-
-
-	int GetSeriesNumber()const
-	{
-		return 0;
-	}
+	const char* getCurImageName() const;
+    const char* getStudyUID() const;
+    const char* getSeriesName() const;
+	long GetSeriesNumber() const;
 
 	//image data
 	vtkImageData* GetData()
 	{
+	    m_image->Print(std::cout);
 		return m_image;
 	};
     //image data
diff --git a/src/src/export/exportdialog.cpp b/src/src/export/exportdialog.cpp
index b405f14..43252d9 100644
--- a/src/src/export/exportdialog.cpp
+++ b/src/src/export/exportdialog.cpp
@@ -73,7 +73,7 @@ void ExportDialog::onBtnExportClicked()
 	{
 		if (cur_view->HasSeries())
 		{
-			QString serieName(cur_view->getSeriesInstance()->getCurSeriesName());
+			QString serieName(cur_view->getSeriesInstance()->getSeriesName());
 			options.inputData.push_back(serieName);
 		}
 	}
@@ -87,7 +87,7 @@ void ExportDialog::onBtnExportClicked()
 //			SeriesImageSet *instance = instanceVec.at(i);
 //			if (instance != nullptr)
 //			{
-//				options.inputData.push_back(instance->getCurSeriesName());
+//				options.inputData.push_back(instance->getSeriesName());
 //			}
 //		}
 	}