X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=42ffc05bccd1d115378148777d5af9f706ebffca;hb=864a539efcd809529bf7f1d6aad6727fd40ace66;hp=f6dba28301b968d46e704d059dfbd6d04c664284;hpb=fdd74c5c2b43621f24a1f22430a04224983aa09f;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index f6dba283..42ffc05b 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -12,19 +12,20 @@ SET(TEST_SOURCES
   TestDcm2Acr.cxx
   TestHash.cxx
   TestWrite.cxx
+  TestReadWriteReadCompare.cxx
+  TestWriteSimple.cxx
 )
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
   SET(TEST_SOURCES ${TEST_SOURCES}     
     #PrintHeader.cxx       #require test.acr
-    PrintDocument.cxx     #require test.acr
+    PrintAllDocument.cxx     #require test.acr
     PrintDicomDir.cxx
     TestFindTags.cxx
     TestChangeHeader.cxx
     TestDicomDir.cxx      #require DICOMDIR
     BuildUpDicomDir.cxx
-    TestReadWrite.cxx
     makeDicomDir.cxx
   )
   # add test that require VTK:
@@ -79,6 +80,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
@@ -88,20 +91,32 @@ 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
-  "gdcm-JPEG-LossLessThoravision.dcm"
-  "cr172241.dcm"  #temporarily remove as it kills my gnome session (but not kde)
-  "emptyImage.dcm"  #the png looks ugly...
-  "gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm" weird looks exactly the same as gdcm-MR-PHILIPS-16-Multi-Seq.dcm
-  "gdcm-MR-PHILIPS-16.dcm" png looks ugly
-  "irmPhlipsNew1.dcm" png looks ugly
-  "mriThruVPRO.dcm"   png looks ugly
-  "US.3405.1.dcm" looks exactly the same as US.1.2.dcm
+  "gdcm-JPEG-LossLessThoravision.dcm" # serial killer
+  "cr172241.dcm"           #temporarily remove as it kills my gnome session (but not kde)
+  "emptyImage.dcm"         #the png looks ugly...
+  "gdcm-MR-PHILIPS-16-Multi-Seq.fixed.dcm" #weird looks exactly the same as gdcm-MR-PHILIPS-16-Multi-Seq.dcm
+  "gdcm-MR-PHILIPS-16.dcm" #png looks ugly
+  "irmPhlipsNew1.dcm"      #png looks ugly
+  "mriThruVPRO.dcm"        #png looks ugly
+  "US.3405.1.dcm"          #looks exactly the same as US.1.2.dcm
+  "8BitsRunLengthColor.dcm"    # Write dicom broken
+  "8BitsUncompressedColor.dcm" # Write dicom broken
+  "OT-PAL-8-face.dcm"          # Write dicom broken
+  "US-PAL-8-10x-echo.dcm"      # Write dicom broken
   )
 
 #   gdcm-ACR-LibIDO seems to be cut