X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=d53cbc71e940dd1b6961f58993d87ce8e359ea1d;hb=bac2910466f502dec4c1842527aa81a8f83f04b8;hp=29d27646e2a8886bac38aebea69eafa3ef1da0a7;hpb=1da135b970b886808d3eb3868c49d0bd02fc486f;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 29d27646..d53cbc71 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,28 +8,44 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 # add test that does not require data:
 # They usally return if no argument is given
 SET(TEST_SOURCES
-  bug1.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
-
-# Disable makeDicomDir for now
-#  makeDicomDir.cxx
-)
+  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              # writes a file named "NewDICOMDIR"
+    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
+    TestCopyDicom.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
+      )
+  ENDIF(GDCM_VTK)
 ENDIF (GDCM_DATA_ROOT)
 
+
+
 # include stuff
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src/
@@ -38,7 +54,12 @@ INCLUDE_DIRECTORIES(
 
 CREATE_TEST_SOURCELIST(Tests gdcmTests.cxx ${TEST_SOURCES})
 ADD_EXECUTABLE(gdcmTests ${Tests})
-TARGET_LINK_LIBRARIES(gdcmTests gdcm)
+IF(GDCM_VTK)
+  TARGET_LINK_LIBRARIES(gdcmTests vtkgdcm vtkRendering)
+ELSE(GDCM_VTK)
+  TARGET_LINK_LIBRARIES(gdcmTests gdcm)
+ENDIF(GDCM_VTK)
+
 SET (TestsToRun ${Tests})
 REMOVE (TestsToRun gdcmTests.cxx)
 
@@ -46,7 +67,7 @@ REMOVE (TestsToRun gdcmTests.cxx)
 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)
@@ -55,6 +76,67 @@ FOREACH(file ${TEST_SOURCES})
 #  ENDIF (GDCM_DATA_ROOT)
 ENDFOREACH(file ${TEST_SOURCES})
 
+#-----------------------------------------------------------------------------
+
+# We need to test the reading of all dicom images in the gdcmData directory
+# First parse this directory and extract all images
+
+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}/*.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
+    "${GDCM_DATA_ROOT}/*.acr"
+    )
+  FILE(GLOB GDCM_DATA_IMAGES_GLOB_DCM
+    "${GDCM_DATA_ROOT}/*.dcm"
+    )
+  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})
+  #SET(GDCM_DATA_IMAGES_GLOB  ${GDCM_DATA_IMAGES_GLOB_ACR})
+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"
+  )
 
+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)
+FOREACH(filename ${GDCM_DATA_IMAGES_GLOB})
+  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_temp}\",")
+  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" 
+  )