X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=68c49b2c18fdb6fb6cb5d5284620ce8700d9a0c2;hb=83d6c83bfcdfa88b7f322286136f802e89d5830c;hp=96586f509a4feb6eb2e840f7384450c692422ca4;hpb=65213cc26fd64f13d05f9e80821117bbbd6134a2;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 96586f50..68c49b2c 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -8,32 +8,60 @@ 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 + TestUtil.cxx TestBug.cxx TestHash.cxx + TestTS.cxx + TestVR.cxx + TestDictGroupName.cxx + TestDict.cxx + TestWriteSimple.cxx + TestImageSet.cxx + TestDicomDirElement.cxx + TestDicomString.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) - SET(TEST_SOURCES ${TEST_SOURCES} - TestReadWriteReadCompare.cxx # includes generated gdcmDataImages.h - PrintAllDocument.cxx # includes generated gdcmDataImages.h - TestAllReadCompareDicom.cxx # includes generated gdcmDataImages.h + SET(TEST_SOURCES ${TEST_SOURCES} + TestFileAccessors.cxx + TestMakeIcon.cxx + TestPrintAllDocument.cxx # includes generated gdcmDataImages.h TestAllEntryVerify.cxx # includes generated gdcmDataImages.h - PrintDicomDir.cxx + TestAllReadCompareDicom.cxx # includes generated gdcmDataImages.h + TestReadWriteReadCompare.cxx # includes generated gdcmDataImages.h + #TestCopyDicom.cxx # includes generated gdcmDataImages.h + TestCopyRescaleDicom.cxx # includes generated gdcmDataImages.h #TestChangeHeader.cxx + TestAnonymize.cxx + TestDirList.cxx TestDicomDir.cxx # require DICOMDIR - BuildUpDicomDir.cxx # writes a file named "NewDICOMDIR" - makeDicomDir.cxx # writes a file named "NewDICOMDIR" - TestCopyDicom.cxx + TestBuildUpDicomDir.cxx # writes a file named "NewDICOMDIR" + TestMakeDicomDir.cxx # writes a file named "NewDICOMDIR" + TestSerieHelper.cxx # uses gdcmData as a default root directory ) # add test that require VTK: IF(GDCM_VTK) - INCLUDE_DIRECTORIES( - ${GDCM_SOURCE_DIR}/vtk/ + 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 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} - ShowDicom.cxx + 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) @@ -59,14 +87,7 @@ 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} ${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}) -# ENDIF (GDCM_DATA_ROOT) + ADD_TEST(${name} ${GDCM_TESTS} ${name}) ENDFOREACH(file ${TEST_SOURCES}) #----------------------------------------------------------------------------- @@ -81,6 +102,12 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) "${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 @@ -98,81 +125,77 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) 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}) + + 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" - - #segfaults TestReadWriteReadCompare (same pb as below) --> Fixed - #segfaults ShowDicom - "gdcm-MR-SIEMENS-16-1.acr" - - #Break ShowDicom - "TestReadWriteReadCompare.dcm" - - # see comments in gdcmData ref file TestAllEntryVerifyReference.txt - # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore - #"SIEMENS_GBS_III-16-ACR_NEMA_1.acr" - - # Frog 2004/07/29: segfaults TestReadWriteReadCompare (pixels not - # parsed properly): - # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore - # "GE_DLX-8-MONO2-Multiframe-Jpeg_Lossless.dcm" - - # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore - #"PICKER-16-MONO2-Nested_icon.dcm" - - # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore - #"SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm" - - # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore - # 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" - - # JPR 2004/20/09: doesn't break TestReadWriteReadCompare anymore - # As of 14/09 this image creates a crash: - # Program received signal SIGSEGV, Segmentation fault. - # 0x4032bc4b in gdcmHeader::GetLUTRGBA (this=0x8149228) - # at /home/malaterre/Creatis/gdcm/src/gdcmHeader.cxx:1170 - # 1170 *a = lutR[i*mult+1]; - "OT-PAL-8-face.dcm" - - # Files which won't break the test suite but whose png dump looks ugly. - # JPR: png looks ugly. so What ? ctest compliant --> un-black listed - # "THERALYS-12-MONO2-Uncompressed-E_Film_Template.dcm" - # "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm" - # "PHILIPS_Gyroscan-12-MONO2-Jpeg_Lossless.dcm" + # Multiframe Papyrus format image + # Just to remember this format exists, and is gdcm::File compliant + # (NOT gdcm::FileHelper ...) + # any contribution is welcome + "PET-cardio-Multiframe-Papyrus.dcm" + # 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" ) +# Add a special test that requires dciodvfy from dicom3tools +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) FOREACH(filename ${GDCM_DATA_IMAGES_GLOB}) GET_FILENAME_COMPONENT(filename_temp ${filename} NAME) + IF(DCIODVFY_FOUND) + 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}\",") + 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" +)