X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=1dedc01fccefbf1720d8bcb39969f0b86f6278c0;hb=51e53b78f995e2dde4f75570a8bf3b0dac5209c2;hp=f5fdc2913de2a33f75f04ea15dfb3db7b9366aef;hpb=26d4556cd9769bba7d3df71ed994cd1a5efa0016;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index f5fdc291..1dedc01f 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -9,33 +9,40 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests) # They usally return if no argument is given SET(TEST_SOURCES TestBug.cxx - TestDcm2Acr.cxx TestHash.cxx - TestWrite.cxx - TestWriteRead.cxx - TestWriteSimple.cxx + TestTS.cxx + TestVR.cxx + TestUtil.cxx + TestDicomString.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 + 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 - TestFindTags.cxx - TestChangeHeader.cxx - TestDicomDir.cxx #require DICOMDIR - BuildUpDicomDir.cxx - TestReadWrite.cxx - makeDicomDir.cxx + #TestChangeHeader.cxx + TestDicomDir.cxx # require DICOMDIR + BuildUpDicomDir.cxx # writes a file named "NewDICOMDIR" + makeDicomDir.cxx # writes a file named "NewDICOMDIR" + TestCopyDicom.cxx + TestCopyRescaleDicom.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 + ShowDicom.cxx + ShowDicomSeq.cxx + TestWriteWithVTK.cxx ) ENDIF(GDCM_VTK) ENDIF (GDCM_DATA_ROOT) @@ -81,9 +88,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 @@ -93,7 +106,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" @@ -101,23 +114,41 @@ 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 + # 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" ) -# gdcm-ACR-LibIDO seems to be cut -# test.acr is very bright +IF(APPLE) + SET(BLACK_LIST ${BLACK_LIST} + "SIEMENS_GBS_III-16-ACR_NEMA_1.acr" # This image contains a wrong length + # Which led us to read pass the end of the file. This seg fault on MacOSX + ) +ENDIF(APPLE) # This is a GLOB expression, change it into a list separated with a comma and \n SET(GDCM_DATA_IMAGES) @@ -129,7 +160,23 @@ FOREACH(filename ${GDCM_DATA_IMAGES_GLOB}) 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" + )