From 731d4ae4dd159f2c97f9d73a3542169342aa7a85 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 4 Mar 2022 13:48:20 +0800
Subject: [PATCH] Add uniqueID and SliceCount to ExtendMedicalImageProperties

---
 src/src/base/DICOMDirectoryHelper.cpp       |  8 ++++++++
 src/src/base/DicomLoader.cpp                | 15 ++-------------
 src/src/base/ExtendMedicalImageProperties.h | 11 +++++++++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/src/base/DICOMDirectoryHelper.cpp b/src/src/base/DICOMDirectoryHelper.cpp
index ff9f58b..86a9060 100644
--- a/src/src/base/DICOMDirectoryHelper.cpp
+++ b/src/src/base/DICOMDirectoryHelper.cpp
@@ -102,6 +102,14 @@ void DICOMDirectoryHelper::getFileProperty(const std::string &path, DICOMFileMap
             ReadTAGToProperty(StudyID, 0x0020, 0x0010);
             seriesProperty->SetSeriesUID(SeriesUID.c_str());
             seriesProperty->SetSeriesNumber(SeriesNumber);
+            std::string uniqueID;
+            uniqueID.append(PatientName);
+            uniqueID.append("_");
+            uniqueID.append(StudyUID);
+            uniqueID.append("_");
+            uniqueID.append(SeriesUID);
+            seriesProperty->SetUniqueID(uniqueID);
+
             double WindowCenter = 0.0;
             dataset->findAndGetFloat64(DcmTagKey(0x0028, 0x1050), WindowCenter);
             double WindowWidth = 0.0;
diff --git a/src/src/base/DicomLoader.cpp b/src/src/base/DicomLoader.cpp
index 4b5da01..eb641fc 100644
--- a/src/src/base/DicomLoader.cpp
+++ b/src/src/base/DicomLoader.cpp
@@ -144,13 +144,7 @@ SeriesImageSet* DicomLoader::getSeriesImageSet(const std::string& uniqueID)//, D
     if (reader) reader->Delete();
     reader = vtkDICOMImageReader2::New();
     auto iter = std::find_if(imageProperties.begin(), imageProperties.end(),[&uniqueID](auto  property){
-        std::string id;
-        id.append(property->GetPatientName());
-        id.append("_");
-        id.append(property->GetStudyUID());
-        id.append("_");
-        id.append(property->GetSeriesUID());
-        return id == uniqueID;
+        return property->GetUniqueID()==uniqueID;
     });
     if (iter==imageProperties.end()) return nullptr;
 
@@ -217,12 +211,7 @@ void DicomLoader::readTags(const std::string &dir, SeriesOpenMode openMode)
     }
     if ( imageProperties.size() > 0 ) {
         currentImageProperty = imageProperties[0];
-        defaultUniqueID = "";
-        defaultUniqueID.append(currentImageProperty->GetPatientName());
-        defaultUniqueID.append("_");
-        defaultUniqueID.append(currentImageProperty->GetStudyUID());
-        defaultUniqueID.append("_");
-        defaultUniqueID.append(currentImageProperty->GetSeriesUID());
+        defaultUniqueID = currentImageProperty->GetUniqueID();
     }
     readSeries();
 }
diff --git a/src/src/base/ExtendMedicalImageProperties.h b/src/src/base/ExtendMedicalImageProperties.h
index 846e929..d2a13cc 100644
--- a/src/src/base/ExtendMedicalImageProperties.h
+++ b/src/src/base/ExtendMedicalImageProperties.h
@@ -59,6 +59,16 @@ public:
         if (FileNames.empty()) return nullptr;
         return FileNames[FileNames.size()/2].data();
     }
+    unsigned  long long  GetSliceCount(){
+        return FileNames.size();
+    }
+
+    const std::string& GetUniqueID(){
+        return uniqueID;
+    }
+    void SetUniqueID(const std::string& id){
+        uniqueID = id;
+    }
 
 protected:
     ExtendMedicalImageProperties();
@@ -69,6 +79,7 @@ protected:
     long AcquisitionNumber = 0;
     unsigned short SamplePerPixel;
     std::vector<std::string> FileNames;
+    std::string uniqueID;
 private:
     ExtendMedicalImageProperties(const ExtendMedicalImageProperties&) = delete;
     void operator=(const ExtendMedicalImageProperties&) = delete;