From: jpr <jpr>
Date: Wed, 2 Apr 2003 09:48:03 +0000 (+0000)
Subject: Correction calcul 'gdcmZSize' dans AddAndDefaultElements.
X-Git-Tag: Version0.3~70
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bb2cb788a245b6377a70de3e8a502dab036165ab;p=gdcm.git

Correction calcul 'gdcmZSize' dans AddAndDefaultElements.
Question : Utilité d'une telle fonction, qui ajoute des Elements non ACR/DICOM dans le PubElValSet
(problèmes lors du DCM Write à prévoir)
--> A remplacer par des accesseurs propres ?
---

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 8ea7eca7..5e6c2c87 100644
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1423,12 +1423,19 @@ void gdcmHeader::AddAndDefaultElements(void) {
 
    NewElVal = NewManualElValToPubDict("gdcmZSize", "US");
    if (!NewElVal) return;
-   NewVal = GetElValByName("Planes");
-   if (NewVal != "gdcm::Unfound")
+   NewVal = GetElValByNumber(0x0028,0x0008); // 0028 0008 IS IMG Number of Frames (DICOM)
+   if (NewVal == "gdcm::Unfound") {
+   	NewVal = GetElValByNumber(0x0028,0x0012); // 028 0012 US IMG Planes (ACR-NEMA)
+   	if (NewVal == "gdcm::Unfound") { 	  // Warning !!! : 6000 0012 US OLY Planes
+   		NewElVal->SetValue("0");
+   	} else {
+      		NewElVal->SetValue(NewVal);
+      	}   		
+   } else {
       NewElVal->SetValue(NewVal);
-   else
-      NewElVal->SetValue("0");
-}
+   }						// length is still wrong 
+}     						// do we care about it?
+
 
 /**
  * \ingroup gdcmHeader