X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Dicts%2FCMakeLists.txt;h=f6ba194f262695f8b5fd5b403f4c19b3375a8684;hb=61bff26eeebf51d3ed118f6e0ebb670fca4cfaab;hp=2d63e0b48c497f2574e5e03a98c5d4faf0f7d66e;hpb=616fe6757e5e27ce6ebb48e9e3bf3b42ab15be1c;p=gdcm.git diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt index 2d63e0b4..f6ba194f 100644 --- a/Dicts/CMakeLists.txt +++ b/Dicts/CMakeLists.txt @@ -1,35 +1,56 @@ #----------------------------------------------------------------------------- # DICOM dictionary stuff - -INSTALL_FILES(${GDCM_DATA_DIR} FILES +#----------------------------------------------------------------------------- +# Generate our own 'DICOM' dictionary, based on the following dictionaries: +SET(ALL_DICTS dicomV3.dic - dicomVR.dic - dicomTS.dic - DicomDir.dic -) + #Papyrus.dic + #NIH.dic #the forbidden one... + # SPI.dic + # PHILIPS-Intera.dic # uncomment me if you want + #GEMS.dic #Commented out to avoid polluting 'non GEMS' images + #GEMS-HiSpeed.dic + # GEMS-Advance.dic + ) + +# Better solution +SET(TEST_DICT_BODY) +FOREACH(dict ${ALL_DICTS}) + # Properly set dependencies, therefore `touch Philips-Intera.dic` does not rebuild + # but adding/removing a line in Philips-Intera.dic rebuild as expected + CONFIGURE_FILE("${GDCM_SOURCE_DIR}/Dicts/${dict}" + "${GDCM_BINARY_DIR}/Dicts/${dict}" COPYONLY IMMEDIATE) + FILE(READ "${GDCM_SOURCE_DIR}/Dicts/${dict}" dict_append) + SET(TEST_DICT_BODY "${TEST_DICT_BODY}\n${dict_append}") +ENDFOREACH(dict) +CONFIGURE_FILE("${GDCM_SOURCE_DIR}/Dicts/gdcm.dic.in" + "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" @ONLY IMMEDIATE) +#----------------------------------------------------------------------------- # Nice trick to avoid creating a .h file each time we compile gdcm # Since CONFIGURE_FILE do a 'copy if different' # We have to write the file here since is contains 'DICOM_DICTIONARY' # Which is a variable afterward... # Following code contributing by Andy Cedilnik (Kitware) -FILE(READ "dicomV3.dic" ENT) -STRING(REGEX REPLACE "\n" ";" ENT "${ENT}") +FILE(READ "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" ENT) +STRING(REGEX REPLACE "\r?\n" ";" ENT "${ENT}") 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}") +#----------------------------------------------------------------------------- +# ... for DicomTS file FILE(READ "dicomTS.dic" ENT_TS) -STRING(REGEX REPLACE "\n" ";" ENT_TS "${ENT_TS}") +STRING(REGEX REPLACE "\r?\n" ";" ENT_TS "${ENT_TS}") SET(DICOM_TS_DICTIONARY "") FOREACH(line ${ENT_TS}) @@ -39,9 +60,11 @@ FOREACH(line ${ENT_TS}) SET(DICOM_TS_DICTIONARY "${DICOM_TS_DICTIONARY}\n${nline}") ENDFOREACH(line) +#----------------------------------------------------------------------------- +# ... for DicomVR file FILE(READ "dicomVR.dic" ENT_VR) STRING(REGEX REPLACE ";" "/" ENT_VR "${ENT_VR}") # CMake doesn't like ';' -STRING(REGEX REPLACE "\n" ";" ENT_VR "${ENT_VR}") +STRING(REGEX REPLACE "\r?\n" ";" ENT_VR "${ENT_VR}") SET(DICOM_VR_DICTIONARY "") FOREACH(line ${ENT_VR}) @@ -51,60 +74,51 @@ FOREACH(line ${ENT_VR}) SET(DICOM_VR_DICTIONARY "${DICOM_VR_DICTIONARY}\n${nline}") ENDFOREACH(line) +#----------------------------------------------------------------------------- +# ... for DictGroupName file +FILE(READ "DictGroupName.dic" ENT_TS) +STRING(REGEX REPLACE "\r?\n" ";" ENT_TS "${ENT_TS}") +SET(DICT_GROUP_NAME_DICTIONARY "") + +FOREACH(line ${ENT_TS}) + STRING(REGEX REPLACE + "^([0-9a-f]+) +(.*)$" + " groupName[0x\\1] = \\2; " nline "${line}") + SET(DICT_GROUP_NAME_DICTIONARY "${DICT_GROUP_NAME_DICTIONARY}\n${nline}") +ENDFOREACH(line) + +#----------------------------------------------------------------------------- +# ... for DicomDir file FILE(READ "DicomDir.dic" ENT_DIR) STRING(REGEX REPLACE "\\\\" "\\\\\\\\" ENT_DIR "${ENT_DIR}") STRING(REGEX REPLACE ";" "/" ENT_DIR "${ENT_DIR}") # CMake doesn't like ';' -STRING(REGEX REPLACE "\n" ";" ENT_DIR "${ENT_DIR}") +STRING(REGEX REPLACE "\r?\n" ";" ENT_DIR "${ENT_DIR}") 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}") + "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"] [\"](.*)[\"] (.*)$" + " {\"\\1\" , 0x\\2 , 0x\\3 , \"\\4\", \"\\5\"}, \\6" 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") - -# See above -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 "") +#----------------------------------------------------------------------------- +# ... Set the dictionnary +SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n {0,0,0,0,0}") -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) +CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in" + "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE) +#----------------------------------------------------------------------------- +# For now GDCM_INSTALL_NO_DICTIONARY is a hidden variables +IF(NOT GDCM_INSTALL_NO_DICTIONARY) + INSTALL_FILES(${GDCM_INSTALL_DATA_DIR} .dic + dicomV3 + dicomVR + dicomTS + DicomDir + DictGroupName + gdcm + ) +ENDIF(NOT GDCM_INSTALL_NO_DICTIONARY) -# Txt generation: -# ~/Software/xpdf-3.00-linux/pdftotext -f 9 -l 81 -raw -nopgbrk 04_06PU.PDF 04_06PU-3.txt