# add test that does not require data:
# They usally return if no argument is given
SET(TEST_SOURCES
- PrintBug.cxx
- dcm2acr.cxx
- hashtest.cxx
- testWrite.cxx
+ TestBug.cxx
+ TestHash.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
- PrintDicomDir.cxx
- pourFindTaggs.cxx
- testChangeEntete.cxx
- testDicomDir.cxx #require DICOMDIR
- BuildUpDicomDir.cxx
- TestReadWrite.cxx
- makeDicomDir.cxx
+ 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
+ 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)
FOREACH(file ${TEST_SOURCES})
GET_FILENAME_COMPONENT(name ${file} NAME_WE)
# IF (GDCM_DATA_ROOT)
-# ADD_TEST(${name} ${CXX_TEST_PATH}/gdcmTests ${name}
+# ADD_TEST(${name} ${GDCM_TESTS} ${name}
# -D ${GDCM_DATA_ROOT}
# -T ${GDCM_BINARY_DIR}/Testing/Temporary
# -V Baseline/gdcm/${name}.png)
FILE(GLOB GDCM_DATA_IMAGES_GLOB
"${GDCM_DATA_ROOT}/*.acr"
"${GDCM_DATA_ROOT}/*.dcm"
+ "${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_DCM
"${GDCM_DATA_ROOT}/*.dcm"
)
- SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
+ FILE(GLOB GDCM_DATA_IMAGES_GLOB_NEMA
+ "${GDCM_DATA_ROOT}/*.nema"
+ )
+ FILE(GLOB GDCM_DATA_IMAGES_GLOB_IMA
+ "${GDCM_DATA_ROOT}/*.ima"
+ )
+ 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})
+
+ 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"
)
# This is a GLOB expression, change it into a list separated with a comma and \n
GET_FILENAME_COMPONENT(filename_temp ${filename} NAME)
STRING(REGEX MATCH ${filename_temp} bad_dicom ${BLACK_LIST})
IF(NOT bad_dicom)
- SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename}\",")
+ 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)
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"
+ )