X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=d97a4c6ef13bac04be241c2a92ffc93104b91118;hb=22234afce4e4a326a065e3b9cd4aacc28bb4437e;hp=d7c6750521436bcf5fb01ceb2a414e029de6a660;hpb=1978138e72f767a6e9cca825857b176faa8236ab;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index d7c67505..d97a4c6e 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -13,25 +13,28 @@ SET(TEST_SOURCES TestHash.cxx TestTS.cxx TestVR.cxx + TestDictGroupName.cxx TestDict.cxx TestWriteSimple.cxx - TestSequence.cxx + TestImageSet.cxx TestDicomDirElement.cxx TestDicomString.cxx + #TestValidate.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) SET(TEST_SOURCES ${TEST_SOURCES} TestFileAccessors.cxx + TestMakeIcon.cxx TestPrintAllDocument.cxx # includes generated gdcmDataImages.h - TestAllEntryVerify.cxx # includes generated gdcmDataImages.h + #TestAllEntryVerify.cxx # includes generated gdcmDataImages.h TestAllReadCompareDicom.cxx # includes generated gdcmDataImages.h TestReadWriteReadCompare.cxx # includes generated gdcmDataImages.h #TestCopyDicom.cxx # includes generated gdcmDataImages.h - TestCopyRescaleDicom.cxx # includes generated gdcmDataImages.h + # TestCopyRescaleDicom.cxx # includes generated gdcmDataImages.h #TestChangeHeader.cxx - TestAnonymize.cxx + # TestAnonymize.cxx TestDirList.cxx TestDicomDir.cxx # require DICOMDIR TestBuildUpDicomDir.cxx # writes a file named "NewDICOMDIR" @@ -40,18 +43,30 @@ IF (GDCM_DATA_ROOT) ) # add test that require VTK: IF(GDCM_VTK) - # Include the VTK library - INCLUDE(${VTK_USE_FILE}) - - INCLUDE_DIRECTORIES( - ${GDCM_SOURCE_DIR}/vtk/ - ) - SET(TEST_SOURCES ${TEST_SOURCES} - VTKTestRead.cxx - VTKTestReadSeq.cxx - VTKTestWrite.cxx - VTKTestWriteSeq.cxx - ) + IF("${VTK_MAJOR_VERSION}" LESS 4) + MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !") + ELSE("${VTK_MAJOR_VERSION}" LESS 4) + IF("${VTK_MAJOR_VERSION}" EQUAL 4 AND "${VTK_MINOR_VERSION}" EQUAL 2) + MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !" + "Although gdcm should compile fine. You just need to turn BUILD_TESTING:=OFF") + ENDIF("${VTK_MAJOR_VERSION}" EQUAL 4 AND "${VTK_MINOR_VERSION}" EQUAL 2) + IF("${VTK_MAJOR_VERSION}" EQUAL 4 AND "${VTK_MINOR_VERSION}" EQUAL 4 AND "${VTK_BUILD_VERSION}" LESS 3) + MESSAGE(FATAL_ERROR "This VTK version is not supported, you are on your own !" + "Although gdcm should compile fine. You just need to turn BUILD_TESTING:=OFF") + ENDIF("${VTK_MAJOR_VERSION}" EQUAL 4 AND "${VTK_MINOR_VERSION}" EQUAL 4 AND "${VTK_BUILD_VERSION}" LESS 3) + # Include the VTK library since we know this is going to work + INCLUDE(${VTK_USE_FILE}) + + INCLUDE_DIRECTORIES( + ${GDCM_SOURCE_DIR}/vtk/ + ) + SET(TEST_SOURCES ${TEST_SOURCES} + VTKTestRead.cxx + VTKTestReadSeq.cxx + VTKTestWrite.cxx + VTKTestWriteSeq.cxx + ) + ENDIF("${VTK_MAJOR_VERSION}" LESS 4) ENDIF(GDCM_VTK) ENDIF (GDCM_DATA_ROOT) @@ -85,57 +100,15 @@ ENDFOREACH(file ${TEST_SOURCES}) # We need to test the reading of all dicom images in the gdcmData directory # First parse this directory and extract all images -IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) - FILE(GLOB GDCM_DATA_IMAGES_GLOB - "${GDCM_DATA_ROOT}/*.acr" - "${GDCM_DATA_ROOT}/*.dcm" - "${GDCM_DATA_ROOT}/*.nema" - "${GDCM_DATA_ROOT}/*.ima" - ) - FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB - "${GDCM_DATA_ROOT}/*FileSeq0.acr" - "${GDCM_DATA_ROOT}/*FileSeq0.dcm" - "${GDCM_DATA_ROOT}/*FileSeq0.nema" - "${GDCM_DATA_ROOT}/*FileSeq0.ima" - ) -ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) - # Since there is a bug in cmake 1.8.3, I'll have to do two separate globs - FILE(GLOB GDCM_DATA_IMAGES_GLOB_ACR - "${GDCM_DATA_ROOT}/*.acr" - ) - FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM - "${GDCM_DATA_ROOT}/*.dcm" - ) - FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA - "${GDCM_DATA_ROOT}/*.nema" - ) - FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA - "${GDCM_DATA_ROOT}/*.ima" - ) - SET(GDCM_DATA_IMAGES_GLOB - ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR} - ${GDCM_DATA_IMAGES_GLOB_NEMA} ${GDCM_DATA_IMAGES_GLOB_IMA}) - - FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_ACR - "${GDCM_DATA_ROOT}/*FileSeq0.acr" - ) - FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_DCM - "${GDCM_DATA_ROOT}/*FileSeq0.dcm" - ) - FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_NEMA - "${GDCM_DATA_ROOT}/*FileSeq0.nema" - ) - FILE(GLOB GDCM_DATA_SEQ_IMAGES_GLOB_IMA - "${GDCM_DATA_ROOT}/*FileSeq0.ima" - ) - SET(GDCM_DATA_SEQ_IMAGES_GLOB - ${GDCM_DATA_SEQ_IMAGES_GLOB_DCM} ${GDCM_DATA_SEQ_IMAGES_GLOB_ACR} - ${GDCM_DATA_SEQ_IMAGES_GLOB_NEMA} ${GDCM_DATA_SEQ_IMAGES_GLOB_IMA}) -ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) +FILE(GLOB GDCM_DATA_IMAGES_GLOB + "${GDCM_DATA_ROOT}/*.acr" + "${GDCM_DATA_ROOT}/*.dcm" + "${GDCM_DATA_ROOT}/*.nema" + "${GDCM_DATA_ROOT}/*.ima" + ) # Black list of images known to break lots of readers (efilm, xmedcon ...): SET(BLACK_LIST - # Multiframe Papyrus format image # Just to remember this format exists, and is gdcm::File compliant # (NOT gdcm::FileHelper ...) @@ -144,8 +117,32 @@ SET(BLACK_LIST # From David Clunie's Compresion Dataset "D_CLUNIE_CT1_JLSN.dcm" "D_CLUNIE_CT1_JLSL.dcm" - "D_CLUNIE_CT1_J2KR.dcm" - "D_CLUNIE_CT1_J2KI.dcm" + #Not a Dicom Image, but a RT Object + "RS2.16.124.113534.2.3.5.0.120040728.21342.353.12747_anonimized.dcm" + #Dicom MPEG image + "ETIAM_video_002.dcm" + #Something stupid occured in the code for LibIDO images. + #I Black list them for a while. JP + "gdcm-ACR-LibIDO.acr" + "LIBIDO-24-ACR_NEMA-Rectangle.dcm" + #16 Bits per pixel images with LUT 16 Bits. + #I wait to be 100% sure before releasing them. JP + "rle16sti.dcm" + "rle16loo.dcm" + ) + +# Don't understand why jasper is segfaulting with borland...I bet a borland bug +IF(BORLAND) + SET(BLACK_LIST + ${BLACK_LIST} + "D_CLUNIE_CT1_J2KR.dcm" + "D_CLUNIE_CT1_J2KI.dcm" + ) +ENDIF(BORLAND) + +# Create a specific list of dicom files that we know are part of a sequence +SET(SEQ_LIST + "SIEMENS_MAGNETOM-12-MONO2-FileSeq[0-9].dcm" ) # Add a special test that requires dciodvfy from dicom3tools @@ -153,25 +150,21 @@ INCLUDE(${GDCM_SOURCE_DIR}/CMake/FindDicom3Tools.cmake) # This is a GLOB expression, change it into a list separated with a comma and \n SET(GDCM_DATA_IMAGES) +SET(GDCM_DATA_SEQ_IMAGES) FOREACH(filename ${GDCM_DATA_IMAGES_GLOB}) GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) IF(DCIODVFY_FOUND) - ADD_TEST("Clunie-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}") + ADD_TEST("DCIODVFY-INPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}") + ADD_TEST("DCIODVFY-OUTPUT-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${GDCM_DATA_ROOT}/BaselineDicom/${filename_temp}") ENDIF(DCIODVFY_FOUND) STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST}) IF(NOT bad_dicom) SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",") - ENDIF(NOT bad_dicom) -ENDFOREACH(filename) - -SET(GDCM_DATA_SEQ_IMAGES) -FOREACH(filename ${GDCM_DATA_SEQ_IMAGES_GLOB}) - GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) - STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST}) - IF(NOT bad_dicom) - STRING(REGEX REPLACE "(.*)FileSeq0(.*)" "\\1FileSeq%d\\2" filename_temp2 ${filename_temp}) - - SET(GDCM_DATA_SEQ_IMAGES "${GDCM_DATA_SEQ_IMAGES}\n\"${filename_temp2}\",") + # SEQ_LIST is a regular expression: + STRING(REGEX MATCH ${SEQ_LIST} is_seq ${filename_temp}) + IF(is_seq) + SET(GDCM_DATA_SEQ_IMAGES "${GDCM_DATA_SEQ_IMAGES}\n\"${filename_temp}\",") + ENDIF(is_seq) ENDIF(NOT bad_dicom) ENDFOREACH(filename)