X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Testing%2FCMakeLists.txt;h=4af332fd5139b80e6ef1c325ae330492df9e061b;hb=99b2e6dd41cb0b1917db68c27da7e1dab5a859f7;hp=648314445007b1dd9ccfded01417c620a7fc93fd;hpb=83903a8fa58a166082caa96c35685de318c69be6;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 64831444..4af332fd 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -9,22 +9,21 @@ SET(GDCM_TESTS ${CXX_TEST_PATH}/gdcmTests)
 # They usally return if no argument is given
 SET(TEST_SOURCES
   TestBug.cxx
-  TestDcm2Acr.cxx
   TestHash.cxx
-  TestWrite.cxx
 )
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
   SET(TEST_SOURCES ${TEST_SOURCES}     
-    PrintHeader.cxx       #require test.acr
+    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
-    pourFindTaggs.cxx
-    testChangeEntete.cxx
-    TestDicomDir.cxx      #require DICOMDIR
-    BuildUpDicomDir.cxx
-    TestReadWrite.cxx
-    makeDicomDir.cxx
+    TestChangeHeader.cxx
+    TestDicomDir.cxx                 # require DICOMDIR
+   # BuildUpDicomDir.cxx
+   # makeDicomDir.cxx
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -60,7 +59,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)
@@ -78,6 +77,8 @@ 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
@@ -87,21 +88,60 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   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})
+  #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
   "gdcm-JPEG-LossLessThoravision.dcm"
+  #temporarily remove as it kills my gnome session (but not kde)
+  "cr172241.dcm"
+  #png looks ugly
+  "emptyImage.dcm"
+  #png looks ugly
+  "irmPhlipsNew1.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"
+  "icone.dcm"
+  "sonataMonaco.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-ACR-LibIDO seems to be cut
+#   test.acr is very bright
+
 # 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}\",")
+    SET(GDCM_DATA_IMAGES "${GDCM_DATA_IMAGES}\n\"${filename_temp}\",")
   ENDIF(NOT bad_dicom)
 ENDFOREACH(filename)