X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=f0d5eae88075bea07f0c8964f8a94fd7da172e97;hb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;hp=c20bc31eb433c769de54f77b8677e66aa5ba00fb;hpb=8b695d4a325b768e1bec82f41d74c49ebb906cc8;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index c20bc31e..f0d5eae8 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -8,33 +8,45 @@ 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 - TestDcm2Acr.cxx TestHash.cxx - TestWrite.cxx - TestReadWriteReadCompare.cxx + TestTS.cxx + TestVR.cxx + TestDicomDirElement.cxx + TestDicomString.cxx + TestDict.cxx TestWriteSimple.cxx ) # add tests that require data IF (GDCM_DATA_ROOT) - SET(TEST_SOURCES ${TEST_SOURCES} - #PrintHeader.cxx #require test.acr - PrintAllDocument.cxx #require test.acr - PrintDicomDir.cxx - TestFindTags.cxx - TestChangeHeader.cxx - TestDicomDir.cxx #require DICOMDIR - BuildUpDicomDir.cxx - makeDicomDir.cxx + SET(TEST_SOURCES ${TEST_SOURCES} + TestSerieHeader # uses gdcmData as a default root directory + 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 # includes generated gdcmDataImages.h + TestCopyRescaleDicom.cxx # includes generated gdcmDataImages.h + 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 + VTKTestRead.cxx + VTKTestReadSeq.cxx + VTKTestWrite.cxx ) ENDIF(GDCM_VTK) ENDIF (GDCM_DATA_ROOT) @@ -80,9 +92,15 @@ 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}/*.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 @@ -92,7 +110,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) "${GDCM_DATA_ROOT}/*.dcm" ) FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA -# "${GDCM_DATA_ROOT}/*.nema" + "${GDCM_DATA_ROOT}/*.nema" ) FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA "${GDCM_DATA_ROOT}/*.ima" @@ -100,35 +118,72 @@ 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 - "gdcm-JPEG-LossLessThoravision.dcm" # serial killer - "cr172241.dcm" #temporarily remove as it kills my gnome session (but not kde) - "emptyImage.dcm" #the png looks ugly... - "gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm" #weird looks exactly the same as gdcm-MR-PHILIPS-16-Multi-Seq.dcm - "gdcm-MR-PHILIPS-16.dcm" #png looks ugly - "irmPhlipsNew1.dcm" #png looks ugly - "mriThruVPRO.dcm" #png looks ugly - "US.3405.1.dcm" #looks exactly the same as US.1.2.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" ) -# gdcm-ACR-LibIDO seems to be cut -# test.acr is very bright +# 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("Clunie-${filename_temp}" "${DCIODVFY_EXECUTABLE}" "${filename}") + 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" + )