X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=cb06b586aaac58ea11a47ca280b3974a3c0927a5;hb=fe9f5b22e228eb450c40a44c637ea6c1b1e6c631;hp=2ba2bca1b4afea0c62813d2b76b84896259dbf60;hpb=8fca7bc2830904113dbb5521c009775d964c5c98;p=gdcm.git diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt index 2ba2bca1..cb06b586 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 @@ -17,19 +21,29 @@ 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 + TestAllEntryVerify.cxx # includes generated gdcmDataImages.h PrintDicomDir.cxx - TestChangeHeader.cxx - TestDicomDir.cxx #require DICOMDIR - BuildUpDicomDir.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 + 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) @@ -75,9 +89,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 @@ -87,7 +107,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" @@ -95,36 +115,34 @@ 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... - "irmPhlipsNew1.dcm" #png looks ugly - "mriThruVPRO.dcm" #png looks ugly - "gdcm-MR-SIEMENS-16-1.acr" #segfaults TestReadWriteReadCompare - #segfaults TestReadWriteReadCompare: this image looks corrupted: - # - it's pixel data is 132096 bytes long - # - it has a size of 256x256 with 16 bytes per pixel, i.e. a size - # of 256*256*2 = 131072 bytes. - # Since there is a missmatch, when we have the following call stack: - # gdcmFile::GetImageData() - # PixelData = new uint8_t[ImageDataSize]; - # \--->::GetImageDataIntoVector(destination, ImageDataSize) - # \---> ::ReadPixelData(destination) - # \---> fread(destination, Header->GetPixelAreaLength(), 1, fp); - # we get a segfault because : - # - destination is ImageDataSize i.e. 131072 bytes long - # - Header->GetPixelAreaLength() = 132096 bytes long - "oldACR00001.ima" - ) + # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile) + "gdcm-JPEG-LossLessThoravision.dcm" -# gdcm-ACR-LibIDO seems to be cut -# test.acr is very bright + # 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" + ) # This is a GLOB expression, change it into a list separated with a comma and \n SET(GDCM_DATA_IMAGES) @@ -136,7 +154,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" + )