From: malaterre <malaterre>
Date: Wed, 3 Nov 2004 19:35:49 +0000 (+0000)
Subject: BUG: Remaining of the patch
X-Git-Tag: Version0.6.bp~16
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=969dfa57f487b615a1c523e5ca19d30beb104957;p=gdcm.git

BUG: Remaining of the patch
---

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index 2d63e0b4..094d08b6 100644
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -70,40 +70,40 @@ SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n 0,0,0,0")
 CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in" "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE)
 
 
-FILE(READ "dicomV3VM2004.dic" ENT2)
-STRING(REGEX REPLACE "\n" ";" ENT2 "${ENT2}")
-SET(DICOM_DICTIONARY2 "")
-
-FOREACH(line ${ENT2})
-  STRING(REGEX REPLACE
-#    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([A-Z]+) (.*)([ \(RET\)]*)$"
-    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([0-9]|[1]-[0-9n]|[2]-[2][n]|[3]-[3][n]) (.*)$"
-#    "   { \\1, \\2, \"\\3\" , \"\\4\" , \"\\5\", \"\\6\"}," nline "${line}")
-    "   { \\1, \\2, \"\\3\" , \"\\4\" , \"\\5\"}," nline "${line}")
-  SET(DICOM_DICTIONARY2 "${DICOM_DICTIONARY2}\n${nline}")
-ENDFOREACH(line)
-
-
-
-#FILE(READ "04_06PU.txt" ENT3)
-FILE(READ "extract.txt" ENT3)
-
-STRING(REGEX REPLACE "\n" ";" ENT3 "${ENT3}")
-SET(DICOM_DICTIONARY3 "")
-
-FOREACH(line ${ENT3})
-  STRING(REGEX REPLACE
-#    "^[(]([0-9a-fA-F]+),([0-9a-fA-F]+)[)] (.*) ([A-ZA-Z]*) ([[0-3][-][1-3n]*|[1-]*[0-9]+]*) ?([RET|Retired]*)$"
-    "^[(]([0-9a-fA-F]+),([0-9a-fA-F]+)[)]  +(.*)  +([A-ZA-Z   [[0-3][-][1-3n]*|[1-]*[0-9]+]]*)([ RET]*)$"
-    "   { \\1 , \\2, \\3, \\4, \\5  }," nline "${line}")
-  STRING(COMPARE NOTEQUAL "${line}" "${nline}" add)
-  IF(add)
-    #SET(DICOM_DICTIONARY3 "${DICOM_DICTIONARY3}\n${nline}")
-    MESSAGE("${nline}")
-  ELSE(add)
-    MESSAGE("WRONG:${nline}")
-  ENDIF(add)
-ENDFOREACH(line)
+#FILE(READ "dicomV3VM2004.dic" ENT2)
+#STRING(REGEX REPLACE "\n" ";" ENT2 "${ENT2}")
+#SET(DICOM_DICTIONARY2 "")
+#
+#FOREACH(line ${ENT2})
+#  STRING(REGEX REPLACE
+##    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([A-Z]+) (.*)([ \(RET\)]*)$"
+#    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([0-9]|[1]-[0-9n]|[2]-[2][n]|[3]-[3][n]) (.*)$"
+##    "   { \\1, \\2, \"\\3\" , \"\\4\" , \"\\5\", \"\\6\"}," nline "${line}")
+#    "   { \\1, \\2, \"\\3\" , \"\\4\" , \"\\5\"}," nline "${line}")
+#  SET(DICOM_DICTIONARY2 "${DICOM_DICTIONARY2}\n${nline}")
+#ENDFOREACH(line)
+#
+#
+#
+##FILE(READ "04_06PU.txt" ENT3)
+#FILE(READ "extract.txt" ENT3)
+#
+#STRING(REGEX REPLACE "\n" ";" ENT3 "${ENT3}")
+#SET(DICOM_DICTIONARY3 "")
+#
+#FOREACH(line ${ENT3})
+#  STRING(REGEX REPLACE
+##    "^[(]([0-9a-fA-F]+),([0-9a-fA-F]+)[)] (.*) ([A-ZA-Z]*) ([[0-3][-][1-3n]*|[1-]*[0-9]+]*) ?([RET|Retired]*)$"
+#    "^[(]([0-9a-fA-F]+),([0-9a-fA-F]+)[)]  +(.*)  +([A-ZA-Z   [[0-3][-][1-3n]*|[1-]*[0-9]+]]*)([ RET]*)$"
+#    "   { \\1 , \\2, \\3, \\4, \\5  }," nline "${line}")
+#  STRING(COMPARE NOTEQUAL "${line}" "${nline}" add)
+#  IF(add)
+#    #SET(DICOM_DICTIONARY3 "${DICOM_DICTIONARY3}\n${nline}")
+#    MESSAGE("${nline}")
+#  ELSE(add)
+#    MESSAGE("WRONG:${nline}")
+#  ENDIF(add)
+#ENDFOREACH(line)
 
 
 # Txt generation:
diff --git a/src/gdcmDefaultDicts.cxx.in b/src/gdcmDefaultDicts.cxx.in
index 1b54f0b1..63db2001 100644
--- a/src/gdcmDefaultDicts.cxx.in
+++ b/src/gdcmDefaultDicts.cxx.in
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDefaultDicts.cxx.in,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 18:08:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2004/11/03 19:35:49 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -85,26 +85,7 @@ void FillDefaultDIRDict(DicomDirElement *dde)
     elem.Group = e.group;
     elem.Elem  = e.element;
     elem.Value = e.value;
-    if( strcmp(e.type, "metaElem" ) == 0 )
-      {
-      dde->GetDicomDirMetaElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "patientElem" ) == 0 )
-      {
-      dde->GetDicomDirPatientElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "studyElem" ) == 0 )
-      {
-      dde->GetDicomDirStudyElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "serieElem" ) == 0 )
-      {
-      dde->GetDicomDirSerieElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "imageElem" ) == 0 )
-      {
-      dde->GetDicomDirImageElements().push_back(elem);
-      }
+    dde->AddNewEntry( e.type, elem);
     e = dataelement[++i];
     }
 }