X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FCMakeLists.txt;h=03a2335f75b39e691a68f4c4cd3baa0a811ba0ab;hb=16887ff26b068405a235a6a8a37f4e62516de393;hp=b4e41de2c26c55ad41fba94a9453dad992d47fb2;hpb=55ef2ceb72dedf6dccfadf8b06e52b3b4cf81f70;p=gdcm.git

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index b4e41de2..03a2335f 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,20 +8,22 @@ 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
-  PrintBug.cxx
-  dcm2acr.cxx
-  hashtest.cxx
-  testWrite.cxx
+  TestBug.cxx
+  TestDcm2Acr.cxx
+  TestHash.cxx
+  TestWrite.cxx
+  TestWriteSimple.cxx
 )
 
 # add tests that require data
 IF (GDCM_DATA_ROOT)
   SET(TEST_SOURCES ${TEST_SOURCES}     
-    PrintHeader.cxx       #require test.acr
+    #PrintHeader.cxx       #require test.acr
+    PrintAllDocument.cxx     #require test.acr
     PrintDicomDir.cxx
-    pourFindTaggs.cxx
-    testChangeEntete.cxx
-    testDicomDir.cxx      #require DICOMDIR
+    TestFindTags.cxx
+    TestChangeHeader.cxx
+    TestDicomDir.cxx      #require DICOMDIR
     BuildUpDicomDir.cxx
     TestReadWrite.cxx
     makeDicomDir.cxx
@@ -60,7 +62,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)
@@ -74,41 +76,59 @@ 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
 
-# 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"
-  )
-
-# Black list of images know to break lots of readers (efilm, xmedcon ...):
+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
-  "gdcm-JPEG-LossLessThoravision.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
   )
 
-SET(GDCM_DATA_IMAGES_GLOB ${GDCM_DATA_IMAGES_GLOB_DCM} ${GDCM_DATA_IMAGES_GLOB_ACR})
-  
+#   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)
-  #MESSAGE(STATUS ${filename_temp})
-  STRING(COMPARE EQUAL ${BLACK_LIST} ${filename_temp} bad_dicom)
-  #MESSAGE(STATUS ${bad_dicom})
+  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)
 
 # Populate GDCM_DATA_IMAGES:
-FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h.in"
-  "const char * const gdcmDataImages[] = { @GDCM_DATA_IMAGES@ \n 0 };" 
-  )
-
-# Generate the header file:
-CONFIGURE_FILE(
-  ${GDCM_BINARY_DIR}/gdcmDataImages.h.in
-  ${GDCM_BINARY_DIR}/gdcmDataImages.h
+FILE(WRITE "${GDCM_BINARY_DIR}/gdcmDataImages.h"
+  "const char * const gdcmDataImages[] = { ${GDCM_DATA_IMAGES}\n0 };\n" 
   )