New Dicom Dictionnaty (with Value Multiplicity) is now used

[gdcm.git] / Dicts / CMakeLists.txt

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index 2d63e0b48c497f2574e5e03a98c5d4faf0f7d66e..4e29811d10a275dd31828ef59efd81cb205e38b4 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -21,12 +21,12 @@ SET(DICOM_DATA_DICTIONARY "")
 
 FOREACH(line ${ENT})
   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?]+) (.*)$"
-    "   0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\", " nline "${line}")
+    "^([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]+) ([1-9n-]+) (.*)$"
+    "   { 0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\" }, " nline "${line}")
   SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY}\n${nline}")
 ENDFOREACH(line)
 
-SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n 0,0,0,0,0")
+SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n { 0,0,0,0,0 }")
 
 FILE(READ "dicomTS.dic" ENT_TS)
 STRING(REGEX REPLACE "\n" ";" ENT_TS "${ENT_TS}")
@@ -60,50 +60,54 @@ SET(DICOM_DIR_DICTIONARY "")
 FOREACH(line ${ENT_DIR})
   STRING(REGEX REPLACE
     "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"](.*)$"
-    "  \"\\1\" , 0x\\2 , 0x\\3 , \"\\4\", \\5" nline "${line}")
+    "  { \"\\1\" , 0x\\2 , 0x\\3 , \"\\4\" }, \\5" nline "${line}")
   SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY}\n${nline}")
 ENDFOREACH(line)
 
-SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n 0,0,0,0")
+SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n { 0,0,0,0 }")
 
 # See above
+FOREACH(file dicomV3.dic  dicomTS.dic dicomVR.dic DicomDir.dic)
+  CONFIGURE_FILE("${GDCM_SOURCE_DIR}/Dicts/${file}"
+    "${GDCM_BINARY_DIR}/Dicts/${file}.out")
+ENDFOREACH(file)
 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: