X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=15eb490655fb60bdaa540b2e888941d98203e36b;hb=c92079b4881cba2560589210d4baeed9dd4d9cac;hp=0e013737b1bc8ae5ba273fe2c3f5a9f321a496e0;hpb=ad06106b0ba563d9cc4405ae6440e8ee0ead51c3;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 0e013737..15eb4906 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
-    TestFindTags.cxx
     TestChangeHeader.cxx
-    TestDicomDir.cxx      #require DICOMDIR
-    BuildUpDicomDir.cxx
-    TestReadWrite.cxx
-    makeDicomDir.cxx
+    TestDicomDir.cxx                 # require DICOMDIR
+    BuildUpDicomDir.cxx              # writes a file named "NewDICOMDIR"
+    makeDicomDir.cxx                 # writes a file named "NewDICOMDIR"
   )
   # add test that require VTK:
   IF(GDCM_VTK)
@@ -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,14 +88,53 @@ 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 (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-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})