X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=60b1e913443f399a90eb768f085f8be48ebbc363;hb=c7ef171977e6b293b82661e8a00f1c21a95fbbf6;hp=9e9eae6edc19ea376de06c46965ae0cacee4fa45;hpb=96a3501f639ac34376ec1d69ce5a4e38c0130fb4;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 9e9eae6e..60b1e913 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -3,50 +3,76 @@ SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH}) -SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmCxxTests) +SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests) # add test that does not require data: # They usally return if no argument is given SET(TEST_SOURCES - bug1.cxx - dcm2acr.cxx - hashtest.cxx - testWrite.cxx + TestBug.cxx + TestHash.cxx + TestTS.cxx + TestVR.cxx + TestUtil.cxx + TestDicomString.cxx + TestDict.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) -SET(TEST_SOURCES ${TEST_SOURCES} - PrintHeader.cxx #require test.acr - PrintDicomDir.cxx - pourFindTaggs.cxx - testChangeEntete.cxx - testDicomDir.cxx #require DICOMDIR - BuildUpDicomDir.cxx - TestReadWrite.cxx - -# Disable makeDicomDir for now -# makeDicomDir.cxx -) + SET(TEST_SOURCES ${TEST_SOURCES} + TestReadWriteReadCompare.cxx # includes generated gdcmDataImages.h + PrintAllDocument.cxx # includes generated gdcmDataImages.h + TestAllReadCompareDicom.cxx # includes generated gdcmDataImages.h + TestAllEntryVerify.cxx # includes generated gdcmDataImages.h + #TestChangeHeader.cxx + TestCopyDicom.cxx + TestCopyRescaleDicom.cxx + TestWriteSimple.cxx + TestDicomDir.cxx # require DICOMDIR + BuildUpDicomDir.cxx # writes a file named "NewDICOMDIR" + makeDicomDir.cxx # writes a file named "NewDICOMDIR" + TestDirList.cxx + ) + # 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} + ShowDicom.cxx + ShowDicomSeq.cxx + TestWriteWithVTK.cxx + ) + ENDIF(GDCM_VTK) ENDIF (GDCM_DATA_ROOT) + + # include stuff INCLUDE_DIRECTORIES( ${GDCM_SOURCE_DIR}/src/ ${GDCM_BINARY_DIR}/ ) -CREATE_TEST_SOURCELIST(Tests gdcmCxxTests.cxx ${TEST_SOURCES}) -ADD_EXECUTABLE(gdcmCxxTests ${Tests}) -TARGET_LINK_LIBRARIES(gdcmCxxTests gdcm) +CREATE_TEST_SOURCELIST(Tests gdcmTests.cxx ${TEST_SOURCES}) +ADD_EXECUTABLE(gdcmTests ${Tests}) +IF(GDCM_VTK) + TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering) +ELSE(GDCM_VTK) + TARGET_LINK_LIBRARIES(gdcmTests gdcm) +ENDIF(GDCM_VTK) + SET (TestsToRun ${Tests}) -REMOVE (TestsToRun gdcmCxxTests.cxx) +REMOVE (TestsToRun gdcmTests.cxx) # Loop over files and create executables FOREACH(file ${TEST_SOURCES}) GET_FILENAME_COMPONENT(name ${file} NAME_WE) # IF (GDCM_DATA_ROOT) -# ADD_TEST(${name} ${CXX_TEST_PATH}/gdcmCxxTests ${name} +# ADD_TEST(${name} ${GDCM_TESTS} ${name} # -D ${GDCM_DATA_ROOT} # -T ${GDCM_BINARY_DIR}/Testing/Temporary # -V Baseline/gdcm/${name}.png) @@ -55,6 +81,103 @@ FOREACH(file ${TEST_SOURCES}) # ENDIF (GDCM_DATA_ROOT) 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) + +# Black list of images known to break lots of readers (efilm, xmedcon ...): +SET(BLACK_LIST + # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile) + #"gdcm-JPEG-LossLessThoravision.dcm" + + # Mathieu: temporarily remove as it kills my gnome session (but not kde) + # JPR: also breaks TestReadWriteReadCompare : Pixel differ (as expanded + # in memory) + #"KODAK-12-MONO1-Odd_Terminated_Sequence.dcm" + + # Multiframe Papyrus format image + # Just to remember this format exist, and is gdcm::Header compliant + # (NOT gdcm::File ...) + # any contribution is welcome + "PET-cardio-Multiframe-Papyrus.dcm" + ) + +# This is a GLOB expression, change it into a list separated with a comma and \n +SET(GDCM_DATA_IMAGES) +FOREACH(filename ${GDCM_DATA_IMAGES_GLOB}) + GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) + 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}\",") + ENDIF(NOT bad_dicom) +ENDFOREACH(filename) +# Populate GDCM_DATA_IMAGES: +FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h" + "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n" + ) +# Populate GDCM_DATA_SEQ_IMAGES: +FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataSeqImages.h" + "const char * const gdcmDataSeqImages[] = { ${GDCM_DATA_SEQ_IMAGES}\n0 };\n" + )