# 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
+ TestDicomDirElement.cxx
+ TestDicomString.cxx
+ TestDict.cxx
+ TestWriteSimple.cxx
)
# add tests that require data
IF (GDCM_DATA_ROOT)
- SET(TEST_SOURCES ${TEST_SOURCES}
+ 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
- PrintDicomDir.cxx
#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"
- TestCopyDicom.cxx
+ 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)
"${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
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"
- #temporarily remove as it kills my gnome session (but not kde)
- "KODAK-12-MONO1-Odd_Terminated_Sequence.dcm"
- #png looks ugly
- "emptyImage.dcm"
- #png looks ugly
- "PHILIPS_Gyroscan-8-MONO2-Odd_Sequence.dcm"
- #png looks ugly
- "mriThruVPRO.dcm"
- #segfaults TestReadWriteReadCompare (same pb as below)
- "gdcm-MR-SIEMENS-16-1.acr"
- # see comments in gdcmData ref file TestAllEntryVerifyReference.txt
- "SIEMENS_GBS_III-16-ACR_NEMA_1.acr"
- #segfaults TestReadWriteReadCompare (pixels not parsed properly):
- "I9000001.dcm"
- "PICKER-16-MONO2-Nested_icon.dcm"
- "SIEMENS_Sonata-16-MONO2-Value_Multiplicity.dcm"
- # 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"
+ #"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"
+
+ # Multiframe Papyrus format image
+ # Just to remember this format exist, and is gdcm::Header compliant
+ # (NOT gdcm::File ...)
+ # any contribution is welcome
+ "PET-cardio-Multiframe-Papyrus.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}/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"
+ )
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff