X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=1438a9b2f76a515d8bc71e0be7adc5cdab21da9b;hb=c6922cf9ead43cbe139c20aef6b7e2d3f342da1c;hp=2c1bfb84417384d402a30efeb7b88db565d5cd54;hpb=d6b6699d3df0af4e4ae3d4d21d88b289ad95efbc;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 2c1bfb84..1438a9b2 100644 --- a/Testing/CMakeLists.txt +++ b/Testing/CMakeLists.txt @@ -10,6 +10,10 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests) SET(TEST_SOURCES TestBug.cxx TestHash.cxx + TestTS.cxx + TestVR.cxx + TestUtil.cxx + TestDicomString.cxx ) # add tests that require data @@ -19,20 +23,26 @@ IF (GDCM_DATA_ROOT) 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 # writes a file named "NewDICOMDIR" makeDicomDir.cxx # writes a file named "NewDICOMDIR" TestCopyDicom.cxx + TestCopyRescaleDicom.cxx + TestWriteSimple.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,6 +91,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,70 +114,35 @@ 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" - ) - # 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}) @@ -172,7 +153,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" + )