Commit cac0efab authored by Gregory Sharp's avatar Gregory Sharp
Browse files

New upstream version 1.7.4+dfsg.1

parent 1f5351c4

CMakeLists.txt

+22 −57
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ project (plastimatch) 
## The version here should be equal to the "most recent release"

set (PLM_VERSION_MAJOR "1")

set (PLM_VERSION_MINOR "7")

set (PLM_VERSION_PATCH "3")

set (PLM_VERSION_PATCH "4")



##-----------------------------------------------------------------------------

##  Set up CMake defaults
@@ -556,47 +556,6 @@ if (ITK_FOUND) 
  include (HandleVXL)

endif ()



##-----------------------------------------------------------------------------

##  GDCM

##-----------------------------------------------------------------------------

if (NOT DCMTK_FOUND AND ITK_FOUND)

  # The default case is that ITK_USE_SYSTEM_GDCM was used,

  # the gdcm use file was already loaded from UseITK.cmake, and therefore

  # GDCM_VERSION is already known.  If this is not the case, we look

  # in the ITK build dir for the header file which contains the version.

  if (NOT GDCM_VERSION)

    unset (GDCM_CONFIGURE_H CACHE)

    find_file (GDCM_CONFIGURE_H gdcmConfigure.h PATHS ${ITK_INCLUDE_DIRS})

    if (GDCM_CONFIGURE_H)

      file (STRINGS "${GDCM_CONFIGURE_H}"

	GDCM_VERSION

	REGEX "^#define GDCM_VERSION *\"([^\"]*)\"")

      string (REGEX REPLACE "[^\"]*\"([^\"]*)\".*" "\\1"

	GDCM_VERSION "${GDCM_VERSION}")

    endif ()

    # When GDCM config file does not configure correctly, the value of

    # the version might be "@GDCM_VERSION@".

    if ("${GDCM_VERSION}" STREQUAL "\@GDCM_VERSION@")

      set (GDCM_VERSION "2.0")

    endif ()

    set (GDCM_FOUND 1)

  endif ()



  if (GDCM_VERSION)

    message (STATUS "GDCM version ${GDCM_VERSION} found")

  else ()

    message (FATAL_ERROR "Found ITK, but didn't find GDCM")

  endif ()



  if (GDCM_VERSION VERSION_LESS "2.0")

    set (GDCM_VERSION_1 1)

  else ()

    set (GDCM_VERSION_2 1)

  endif ()

else ()

  # No itk?  Use dcmtk instead

endif ()



##-----------------------------------------------------------------------------

##  QT

##-----------------------------------------------------------------------------
@@ -690,7 +649,19 @@ add_subdirectory (src) 
if (ITK_FOUND)

  set (DLL_PATTERNS "ITKCommon*.dll" "ITKIO*.dll" "ITKOptimizers*.dll" "ITKStatistics*.dll" "ITKTransform*.dll")

  foreach (p ${DLL_PATTERNS})

    file (GLOB DLLFILES "${ITK_DIR}/bin/release/${p}")

    # .../bin/release/*.dll for build tree, .../bin/*.dll for install tree

    file (GLOB DLLFILES "${ITK_DLL_DIR}/${p}")

    if (DLLFILES)

      install (FILES ${DLLFILES} DESTINATION bin)

    endif ()

  endforeach ()

endif ()



if (DCMTK_FOUND)

  set (DLL_PATTERNS "oflog.dll" "ofstd.dll" "dcmdata.dll")

  foreach (p ${DLL_PATTERNS})

    # .../bin/release/*.dll for build tree, .../bin/*.dll for install tree

    file (GLOB DLLFILES "${DCMTK_DIR}/bin/release/${p}")

    if (DLLFILES)

      install (FILES ${DLLFILES} DESTINATION bin)

    endif ()
@@ -783,23 +754,15 @@ if (WIN32 AND NOT CYGWIN AND NOT MINGW) 
  set (PLM_PLASTIMATCH_TESTING_PATH

    ${PLM_BINARY_DIR}/Testing/Release)

  set (PLM_FFTW_PATH ${FFTW_DIR})

  # At some point in time (presumably around ITK 4.1), ITK stopped

  # creating the variable ITK_LIBRARY_DIRS.  Therefore, we have to

  # use another method to find the ITK directory needed to run tests.

  if (NOT ITK_FOUND)

    set (PLM_ITK_LIBRARY_PATH_HACK

      -DITK_LIBRARY_PATH=${PLM_BINARY_DIR}/ITK-build/bin/Release)

  elseif (${ITK_VERSION} VERSION_LESS "4.1")

    set (PLM_ITK_LIBRARY_PATH_HACK

      -DITK_LIBRARY_PATH=${ITK_LIBRARY_DIRS}/Release)



  if (NOT "${ITK_DLL_DIR}" STREQUAL "")

    set (PLM_ITK_LIBRARY_PATH_HACK -DITK_LIBRARY_PATH=${ITK_DLL_DIR})

  else ()

    string (REGEX REPLACE "/[^/]*$" "" ITK_LIBRARY_DIRS_41

      "${ITK_CONFIG_TARGETS_FILE}")

    set (PLM_ITK_LIBRARY_PATH_HACK

      -DITK_LIBRARY_PATH=${ITK_LIBRARY_DIRS_41}/bin/Release)

    set (PLM_ITK_LIBRARY_PATH_HACK "")

  endif ()

  set (PLM_PLASTIMATCH_PATH_HACK

     -DPLM_PLASTIMATCH_PATH=${PLM_PLASTIMATCH_PATH})

  set (PLM_DCMTK_PATH_HACK -DPLM_DCMTK_PATH=${DCMTK_DIR}/bin/Release)

  set (PLM_FFTW_PATH_HACK

     -DPLM_FFTW_PATH=${PLM_FFTW_PATH})

else ()
@@ -808,6 +771,7 @@ else () 
  set (PLM_FFTW_PATH "${FFTW_DIR}")

  set (PLM_ITK_LIBRARY_PATH_HACK "")

  set (PLM_PLASTIMATCH_PATH_HACK "")

  set (PLM_DCMTK_PATH_HACK "")

  set (PLM_FFTW_PATH_HACK "")

endif ()
@@ -825,6 +789,7 @@ macro (PLM_ADD_TEST PLM_TEST_NAME PLM_TEST_COMMAND PARMS) 
    -DPLM_TEST_NAME=${PLM_TEST_NAME}

    ${PLM_ITK_LIBRARY_PATH_HACK}

    ${PLM_PLASTIMATCH_PATH_HACK}

    ${PLM_DCMTK_PATH_HACK}

    ${PLM_FFTW_PATH_HACK}

    -DPLM_TEST_COMMAND=${PLM_TEST_COMMAND}

    -DPLM_TESTING_SOURCE_DIR=${PLM_TESTING_SOURCE_DIR}

Testing/CMakeLists.txt

+272 −59

File changed.

Preview size limit exceeded, changes collapsed.

Testing/CTestCustom.cmake.in

+5 −50
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ set (FFTW_FOUND @FFTW_FOUND@) 
set (ITK_VERSION "@ITK_VERSION@")

set (OPENCL_FOUND @OPENCL_FOUND@)

set (PLM_DCM_USE_DCMTK "@PLM_DCM_USE_DCMTK@")

set (PLM_DCM_USE_GDCM1 "@PLM_DCM_USE_GDCM1@")

set (PLM_DCM_USE_GDCM2 "@PLM_DCM_USE_GDCM2@")

set (PLM_PLASTIMATCH_PATH "@PLM_PLASTIMATCH_PATH@")

set (PLM_PLASTIMATCH_PATH_HACK "@PLM_PLASTIMATCH_PATH_HACK@")

set (PLM_REDUCED_TESTS @PLM_REDUCED_TESTS@)
@@ -305,57 +303,14 @@ if (NOT PLM_DCM_USE_DCMTK) 
    )

endif ()



## If we only have GDCM 2, don't run these tests

if (PLM_DCM_USE_GDCM2)

  set (CTEST_CUSTOM_TESTS_IGNORE

    ${CTEST_CUSTOM_TESTS_IGNORE}

    "plm-convert-dicom-donut-a" 

    "plm-convert-dicom-donut-a-stats" 

    "plm-convert-dicom-donut-a-check" 

    "plm-convert-dicom-donut-b" 

    "plm-convert-dicom-donut-b-stats" 

    "plm-convert-dicom-donut-b-check" 

    "plm-convert-dicom-a"

    "plm-convert-dicom-a-stats" 

    "plm-convert-dicom-a-check" 

    "plm-convert-dicom-b"

    "plm-convert-dicom-b-stats"

    "plm-convert-dicom-b-check"

    "plm-convert-dicom-c" 

    "plm-convert-dicom-c-stats" 

    "plm-convert-dicom-c-check" 

    "plm-convert-dicom-f" 

    "plm-convert-cxt"

    "plm-convert-cxt-stats"

    "plm-convert-cxt-check"

    )

endif ()



## Dose calculation not yet supported on debian

## These tests are failing

if (PLM_CONFIG_DEBIAN_BUILD)

  set (CTEST_CUSTOM_TESTS_IGNORE

    ${CTEST_CUSTOM_TESTS_IGNORE}

    "proton-dose-1"

    "proton-dose-1-stats"

    "proton-dose-1-check"

    "proton-dose-2"

    "proton-dose-2-stats"

    "proton-dose-2-check"

    "proton-dose-3"

    "proton-dose-3-stats"

    "proton-dose-3-check"

    "proton-dose-5a"

    "proton-dose-5a-stats"

    "proton-dose-5a-check"

    "proton-dose-5d"

    "proton-dose-5d-stats"

    "proton-dose-5d-check"

    "proton-dose-5g"

    "proton-dose-5g-stats"

    "proton-dose-5g-check"

    "proton-dose-6a"

    "proton-dose-6a-stats"

    "proton-dose-6a-check"

    "proton-dose-7a"

    "proton-dose-8d"

    "proton-dose-8d-stats"

    "proton-dose-8d-check"

    )

endif ()

Testing/Data/plm-bsp-rect.txt

+1 −1
Original line number Diff line number Diff line 
[GLOBAL]

fixed=@PLM_BUILD_TESTING_DIR@/rect-2.mha

moving=@PLM_BUILD_TESTING_DIR@/rect-3.mha

vf_out=@PLM_BUILD_TESTING_DIR@/plm-bsp-rect-vf.mha

vf_out=@PLM_BUILD_TESTING_DIR@/plm-bsp-rect-vf.nrrd

xform_out=@PLM_BUILD_TESTING_DIR@/plm-bsp-rect-xf.txt

img_out=@PLM_BUILD_TESTING_DIR@/plm-bsp-rect-img.mha

Testing/Data/proton-dose-4.txt

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
[PLAN]

patient = @PLM_BUILD_TESTING_DIR@/rect-18.mha

dose_out = @PLM_BUILD_TESTING_DIR@/proton-dose4.mha



[BEAM]

flavor = h

homo_approx = n

depth_dose_z_max = 400



source = 0 -2200 0

isocenter = 0 0 0



aperture_origin = -37.5 -37.5

aperture_offset = 1500

aperture_spacing = 7.5 7.5

aperture_resolution = 10 10

range_compensator_file_in = @PLM_BUILD_TESTING_DIR@/rgc-1.mha

source_size = 0



[PEAK]

energy=100.0000

spread=1.000000

weight=1