X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Dicts%2FCMakeLists.txt;h=094d08b65e6f0b48e4c1ce47e8427d2de6173abc;hb=969dfa57f487b615a1c523e5ca19d30beb104957;hp=2d63e0b48c497f2574e5e03a98c5d4faf0f7d66e;hpb=616fe6757e5e27ce6ebb48e9e3bf3b42ab15be1c;p=gdcm.git 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: