From bb2cb788a245b6377a70de3e8a502dab036165ab Mon Sep 17 00:00:00 2001
From: jpr <jpr>
Date: Wed, 2 Apr 2003 09:48:03 +0000
Subject: [PATCH] =?utf8?q?Correction=20calcul=20'gdcmZSize'=20dans=20AddAn?=
 =?utf8?q?dDefaultElements.=20Question=20:=20Utilit=E9=20d'une=20telle=20f?=
 =?utf8?q?onction,=20qui=20ajoute=20des=20Elements=20non=20ACR/DICOM=20dan?=
 =?utf8?q?s=20le=20PubElValSet=20(probl=E8mes=20lors=20du=20DCM=20Write=20?=
 =?utf8?q?=E0=20pr=E9voir)=20-->=20A=20remplacer=20par=20des=20accesseurs?=
 =?utf8?q?=20propres=20=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/gdcmHeader.cxx | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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
-- 
2.48.1