X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=c64b83a4a23d312df9b1ca98a45413f9d095e87c;hb=922095a0dd56f24d651b36f62256690020937d9a;hp=0899b62aa90b9e38028933774cc079a7a92ee392;hpb=9649936f884197f6f6260aae051d33729bce07d5;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 0899b62a..c64b83a4 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -12,6 +12,8 @@ SET(TEST_SOURCES
   TestHash.cxx
   TestTS.cxx
   TestVR.cxx
+  TestUtil.cxx
+  TestDicomString.cxx
 )
 
 # add tests that require data
@@ -27,14 +29,20 @@ IF (GDCM_DATA_ROOT)
     BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
     makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
     TestCopyDicom.cxx
+    TestCopyRescaleDicom.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)
@@ -83,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
@@ -100,7 +114,22 @@ 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 ...):
@@ -108,12 +137,21 @@ SET(BLACK_LIST
   # serial killer (also segfaults vtkgdcmViewer, but NOT PrintFile)
   "gdcm-JPEG-LossLessThoravision.dcm"
   
+  # Bad decompression of the jpeg part
+  "GE_RHAPSODE-16-MONO2-JPEG-Fragments.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)
@@ -125,7 +163,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" 
+  )