X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=4af332fd5139b80e6ef1c325ae330492df9e061b;hb=99b2e6dd41cb0b1917db68c27da7e1dab5a859f7;hp=4f427f562eba228c0e94f5fabd27bbca5c18841f;hpb=5285811a83dcd08d4e9364c74ebe1b163688f5bb;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 4f427f56..4af332fd 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -1,67 +1,151 @@ -# TODO: -# http://www.cmake.org/pipermail/cmake/2001-November/002491.html -# So that dll is copied to each subdir where needed +# CMakeLists for Testing purpose +# Cxx file that need a file to run should be place aproprietly SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH}) SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests) -#INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) -#CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H) - -#IF(NOT CMAKE_HAVE_STDINT_H) -# SET(GDCM_TEST_COMPILE_FLAGS "-DHAVE_NO_STDINT_H") -#ENDIF(NOT CMAKE_HAVE_STDINT_H) - - +# add test that does not require data: +# They usally return if no argument is given SET(TEST_SOURCES - PrintHeader.cxx #require test.acr - bug1.cxx #require test.acr - dcm2acr.cxx #require test.acr - hashtest.cxx - makeDicomDir.cxx - testDicomDir.cxx - testWrite.cxx + TestBug.cxx + TestHash.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) -SET(TEST_SOURCES ${TEST_SOURCES} - PrintDicomDir.cxx - pourFindTaggs.cxx - testChangeEntete.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 + PrintDicomDir.cxx + TestChangeHeader.cxx + TestDicomDir.cxx # require DICOMDIR + # BuildUpDicomDir.cxx + # makeDicomDir.cxx + ) + # add test that require VTK: + IF(GDCM_VTK) + INCLUDE_DIRECTORIES( + ${GDCM_SOURCE_DIR}/vtk/ + ) + SET(TEST_SOURCES ${TEST_SOURCES} + ShowDicom.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) -SET (TestsToRun ${Tests}) -REMOVE (TestsToRun gdcmCxxTests.cxx) +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) -#ADD_EXECUTABLE(gdcmTests gdcmTests.cxx ${TEST_SOURCES}) -#TARGET_LINK_LIBRARIES(gdcmTests gdcm) +SET (TestsToRun ${Tests}) +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(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName} -# -D ${VTK_DATA_ROOT} -# -T ${VTK_BINARY_DIR}/Testing/Temporary -# -V Baseline/gdcm/${TName}.png) +# ADD_TEST(${name} ${GDCM_TESTS} ${name} +# -D ${GDCM_DATA_ROOT} +# -T ${GDCM_BINARY_DIR}/Testing/Temporary +# -V Baseline/gdcm/${name}.png) # ELSE (GDCM_DATA_ROOT) ADD_TEST(${name} ${GDCM_TESTS} ${name}) - #ADD_TEST(${TName} ${CXX_TEST_PATH}/gdcmCxxTests ${TName}) # 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" + ) +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}) + #SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_ACR}) +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 + "gdcm-JPEG-LossLessThoravision.dcm" + #temporarily remove as it kills my gnome session (but not kde) + "cr172241.dcm" + #png looks ugly + "emptyImage.dcm" + #png looks ugly + "irmPhlipsNew1.dcm" + #png looks ugly + "mriThruVPRO.dcm" + #segfaults TestReadWriteReadCompare (same pb as below) + "gdcm-MR-SIEMENS-16-1.acr" + # see comments in gdcmData ref file TestAllEntryVerifyReference.txt + "SIEMENS_GBS_III-16-ACR_NEMA_1.acr" + #segfaults TestReadWriteReadCompare (pixels not parsed properly): + "I9000001.dcm" + "icone.dcm" + "sonataMonaco.dcm" + # Fails on TestAllReadCompareDicom at the RE-reading stage with message: + # Big trouble : Pixel Element (7fe0,10) NOT found + # The temporary file GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm + # stops after the first binEntry (binary entry) as can be seen with + # " gdcmbin/bin/PrintHeader + # GDCMDATAHOME/BaselineDicom/SIEMENS_Sonata-12-MONO2-SQ.dcm " + # and effectively the pixels are missing (as well as all the entries + # after tag 0029|1010) + # Note: this file was previously known as E00001S03I0015.dcm + "SIEMENS_Sonata-12-MONO2-SQ.dcm" + ) +# gdcm-ACR-LibIDO seems to be cut +# test.acr is very bright +# 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) +# Populate GDCM_DATA_IMAGES: +FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h" + "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n" + )