From 64f9af11871018c01c71d26a113055bd06bc0e21 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 25 Feb 2022 13:25:24 +0800
Subject: [PATCH] Add SamplePerPixel to ExtendMedicalImageProperties

---
 src/src/base/DICOMDirectoryHelper.cpp       | 5 +++++
 src/src/base/ExtendMedicalImageProperties.h | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/src/base/DICOMDirectoryHelper.cpp b/src/src/base/DICOMDirectoryHelper.cpp
index 596ed16..ff9f58b 100644
--- a/src/src/base/DICOMDirectoryHelper.cpp
+++ b/src/src/base/DICOMDirectoryHelper.cpp
@@ -113,6 +113,11 @@ void DICOMDirectoryHelper::getFileProperty(const std::string &path, DICOMFileMap
             dataset->findAndGetFloat64(DcmTagKey(0x0028, 0x0030), Spacing[1], 1);
             seriesProperty->SetSpacing(Spacing);
 
+            unsigned short SamplePerPixel = 0;
+            dataset->findAndGetUint16(DcmTagKey(0x0028, 0x0002), SamplePerPixel);
+            seriesProperty->SetSamplePerPixel(SamplePerPixel);
+            //TODO:暂时不考虑颜色空间的事（只与缩略图相关！！！）
+
             seriesProperties.push_back(seriesProperty);
             //暂时不考虑acqnumber的影响
             //seriesProperty->SetAcquisitionNumber(AcquisitionNumber);
diff --git a/src/src/base/ExtendMedicalImageProperties.h b/src/src/base/ExtendMedicalImageProperties.h
index f073fde..22b3335 100644
--- a/src/src/base/ExtendMedicalImageProperties.h
+++ b/src/src/base/ExtendMedicalImageProperties.h
@@ -28,6 +28,9 @@ public:
     vtkGetMacro(AcquisitionNumber, long)
     vtkSetMacro(AcquisitionNumber, long)
 
+    vtkGetMacro(SamplePerPixel, unsigned short)
+    vtkSetMacro(SamplePerPixel, unsigned short)
+
     vtkSetVector2Macro(Spacing,double);
     vtkGetVector2Macro(Spacing,double);
 
@@ -60,6 +63,7 @@ protected:
     char * SeriesUID = nullptr;
     double Spacing[2] ={1.0,1.0};
     long AcquisitionNumber = 0;
+    unsigned short SamplePerPixel;
     std::vector<std::string> FileNames;
 private:
     ExtendMedicalImageProperties(const ExtendMedicalImageProperties&) = delete;