[med-svn] [Git][med-team/vtk-dicom][master] 3 commits: New upstream version 0.8.12
Gert Wollny
gitlab at salsa.debian.org
Fri Dec 20 20:17:14 GMT 2019
Gert Wollny pushed to branch master at Debian Med / vtk-dicom
Commits:
8b2083eb by Gert Wollny at 2019-12-20T20:13:16Z
New upstream version 0.8.12
- - - - -
6e7a3b64 by Gert Wollny at 2019-12-20T20:13:23Z
Update upstream source from tag 'upstream/0.8.12'
Update to upstream version '0.8.12'
with Debian dir 81e1e855d169afceefee70c7edb8bac9be5aef1c
- - - - -
3e2c56c4 by Gert Wollny at 2019-12-20T20:16:03Z
Update changelog
- - - - -
14 changed files:
- CMakeLists.txt
- Source/CMakeLists.txt
- + Source/dicom.module
- Source/vtkDICOMDictHash.cxx
- Source/vtkDICOMDictHash.h
- Source/vtkDICOMDirectory.cxx
- Source/vtkDICOMFile.cxx
- Source/vtkDICOMFileSorter.cxx
- Source/vtkDICOMReader.h
- Source/vtkDICOMUtilitiesUIDTable.cxx
- Testing/CMakeLists.txt
- Utilities/nemadict.txt
- Utilities/nemauids.txt
- debian/changelog
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -14,7 +14,7 @@ include(CTest)
# Project version
set(DICOM_MAJOR_VERSION 0)
set(DICOM_MINOR_VERSION 8)
-set(DICOM_PATCH_VERSION 11)
+set(DICOM_PATCH_VERSION 12)
set(DICOM_SHORT_VERSION "${DICOM_MAJOR_VERSION}.${DICOM_MINOR_VERSION}")
set(DICOM_VERSION "${DICOM_SHORT_VERSION}.${DICOM_PATCH_VERSION}")
@@ -29,7 +29,18 @@ set(DICOM_INCLUDE_DIRS
"${DICOM_SOURCE_DIR}/Source"
"${DICOM_BINARY_DIR}/Source")
-if(DEFINED VTK_MODULE_ENABLE_VTK_DICOM)
+# Is this CMakeLists.txt file being called directly by cmake?
+if("${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
+ set(_dicom_direct_build ON)
+else()
+ set(_dicom_direct_build OFF)
+endif()
+
+set(DICOM_EXTERNAL_BUILD ${_dicom_direct_build} CACHE BOOL
+ "Building DICOM module external to the VTK build")
+mark_as_advanced(DICOM_EXTERNAL_BUILD)
+
+if(DEFINED VTK_MODULE_ENABLE_VTK_DICOM AND NOT DICOM_EXTERNAL_BUILD)
# When building as a remote module for VTK 9 (or VTK 8.90+)
message(STATUS "vtkDICOM: Building vtkDICOM as a Remote VTK Module")
@@ -65,6 +76,23 @@ elseif(Module_vtkDICOM)
set(BUILD_EXAMPLES ${BUILD_DICOM_EXAMPLES})
else()
+ # When building external to VTK
+ message(STATUS "vtkDICOM: Building vtkDICOM outside of VTK")
+
+ # Find VTK and get VTK configuration information
+ find_package(VTK REQUIRED)
+
+ # define VTK_VERSION if not already defined
+ if(NOT DEFINED VTK_VERSION)
+ set(VTK_VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
+ endif()
+ if(VTK_VERSION VERSION_LESS 8.90)
+ include(${VTK_USE_FILE})
+ endif()
+ if(VTK_VERSION VERSION_LESS 5.8)
+ message(FATAL_ERROR "VTK 5.8 or later is required.")
+ endif()
+
# We are being built as a stand-alone package
set(VTK_DICOM_LINK_TARGET vtkDICOM)
@@ -80,30 +108,9 @@ else()
option(BUILD_PROGRAMS "Build some useful DICOM tools" ON)
option(BUILD_EXAMPLES "Build the examples" OFF)
- find_package(VTK REQUIRED)
- message(STATUS "vtkDICOM: Building vtkDICOM stand-alone")
- if(NOT DEFINED VTK_VERSION)
- # backwards compatibility pre VTK 9.x
- set(VTK_VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
- endif()
- if(VTK_VERSION VERSION_LESS 8.90)
- include(${VTK_USE_FILE})
- endif()
- if(VTK_VERSION VERSION_LESS 5.8)
- message(FATAL_ERROR "VTK 5.8 or later is required.")
- endif()
-
# Wrap Python option
if(VTK_WRAP_PYTHON)
- if(VTK_VERSION VERSION_LESS 8.90)
- option(BUILD_PYTHON_WRAPPERS "Build python wrappers" ON)
- else()
- message(WARNING
- "Stand-alone vtkDICOMPython not yet supported for "
- "VTK ${VTK_VERSION}, try building vtk-dicom as a remote "
- "module instead.")
- unset(BUILD_PYTHON_WRAPPERS CACHE)
- endif()
+ option(BUILD_PYTHON_WRAPPERS "Build python wrappers" ON)
else()
unset(BUILD_PYTHON_WRAPPERS CACHE)
endif()
@@ -117,19 +124,14 @@ else()
# Wrap Java option
if(VTK_WRAP_JAVA)
- if(VTK_VERSION VERSION_LESS 8.90)
- option(BUILD_PYTHON_WRAPPERS "Build python wrappers" ON)
- else()
- message(WARNING
- "Stand-alone vtkDICOMJava not yet supported for "
- "VTK ${VTK_VERSION}, try building vtk-dicom as a remote "
- "module instead.")
- unset(BUILD_JAVA_WRAPPERS CACHE)
- endif()
+ option(BUILD_JAVA_WRAPPERS "Build java wrappers" OFF)
else()
unset(BUILD_JAVA_WRAPPERS CACHE)
endif()
+ # Defines CMAKE_INSTALL_LIBDIR etcetera
+ include(GNUInstallDirs)
+
# Set up our directory structure for output libraries and binaries
# (Note: these are the build locations, not the install locations)
if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
@@ -168,58 +170,61 @@ else()
include_directories("${ZLIB_INCLUDE_DIR}")
endif()
endif()
-endif()
-# GDCM or DCMTK are required for reading compressed DICOM images
-option(USE_ITK_GDCM "Use ITK's GDCM for image decompression" OFF)
-option(USE_GDCM "Use GDCM for image decompression" OFF)
-if(USE_ITK_GDCM)
- # To avoid conflicts, we might want to use ITK's GDCM
- find_package(ITK REQUIRED)
- if(ITK_FOUND)
- include(${ITK_USE_FILE})
- set(GDCM_LIBS gdcmMSFF gdcmIOD gdcmDSED gdcmDICT)
- set(GDCM_FOUND 1)
- set(USE_GDCM ON CACHE BOOL "Use GDCM for image decompression" FORCE)
- endif()
-elseif(USE_GDCM)
- find_package(GDCM)
- if(NOT GDCM_DIR)
- message(FATAL_ERROR "Please set GDCM_DIR.")
- endif()
- if(GDCM_FOUND)
- include(${GDCM_USE_FILE})
- set(GDCM_LIBS gdcmMSFF gdcmIOD gdcmDSED gdcmDICT)
- endif()
-endif()
+ if(NOT VTK_VERSION VERSION_LESS 8.90)
+ # When building as a stand-alone module for VTK 9
+ message(STATUS "vtkDICOM: Building as an External VTK Module")
-option(USE_DCMTK "Use DCMTK for image decompression" OFF)
-set(DCMTK_LIBS)
-if(USE_DCMTK)
- find_package(DCMTK)
- if(NOT DCMTK_FOUND)
- message(FATAL_ERROR "DCMTK not found or incomplete.")
- endif()
- if(${DCMTK_charls_LIBRARY})
- set(DCMTK_LIBS ${DCMTK_LIBRARIES} ${DCMTK_charls_LIBRARY})
- else()
- set(DCMTK_LIBS ${DCMTK_LIBRARIES})
- endif()
- if(APPLE)
- list(APPEND DCMTK_LIBS iconv)
- endif()
- include_directories(${DCMTK_INCLUDE_DIRS})
-endif()
+ # Clear VTK_LIBS, linking will be handled by modular build
+ set(VTK_LIBS)
+ set(VTK_DICOM_LINK_TARGET VTK::DICOM)
+
+ # To set DICOM_USE_VTKZLIB in vtkDICOMConfig.h
+ set(DICOM_USE_VTKZLIB ON)
+
+ vtk_module_scan(
+ MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Source/dicom.module"
+ REQUEST_MODULES "VTK::DICOM"
+ PROVIDES_MODULES dicom_modules
+ ENABLE_TESTS "${BUILD_TESTING}")
+
+ vtk_module_build(
+ MODULES ${dicom_modules}
+ INSTALL_EXPORT DICOM
+ ARCHIVE_DESTINATION "lib"
+ HEADERS_DESTINATION "include/dicom${DICOM_SHORT_VERSOIN}"
+ CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vtk"
+ LICENSE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk"
+ HIERARCHY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/vtk/hierarchy/${CMAKE_PROJECT_NAME}"
+ LIBRARY_NAME_SUFFIX "${DICOM_CUSTOM_LIBRARY_SUFFIX}"
+ VERSION "${DICOM_VERSION}"
+ SOVERSION "1"
+ TEST_DATA_TARGET DicomData
+ USE_EXTERNAL "${DICOM_USE_EXTERNAL}"
+ TEST_INPUT_DATA_DIRECTORY "${dicom_test_data_directory_input}"
+ TEST_OUTPUT_DATA_DIRECTORY "${dicom_test_data_directory_output}")
+
+ if(BUILD_PYTHON_WRAPPERS)
+ find_package(PythonInterp ${VTK_PYTHON_VERSION} QUIET)
+
+ vtk_module_wrap_python(
+ MODULES ${dicom_modules}
+ INSTALL_EXPORT DICOMPython
+ PYTHON_PACKAGE "vtk.modules"
+ #MODULE_DESTINATION ""
+ CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vtk"
+ LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ BUILD_STATIC OFF)
+ endif()
+
+ if(BUILD_JAVA_WRAPPERS)
+ vtk_module_wrap_java(
+ MODULES ${dicom_modules}
+ WRAPPED_MODULES dicom_java_wrapped_modules
+ JAVA_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles")
+ endif()
+ endif() #(NOT VTK_VERSION VERSION_LESS 8.90)
-# Check for sqlite3 for reading OsiriX databases
-set(USE_SQLITE_DEFAULT OFF)
-set(SQLITE_LIBS)
-if(APPLE)
- set(USE_SQLITE_DEFAULT ON)
-endif()
-option(USE_SQLITE "Use SQLite for OsiriX databases" ${USE_SQLITE_DEFAULT})
-if(USE_SQLITE)
- set(SQLITE_LIBS sqlite3)
endif()
# Store the git hash of the current head
@@ -321,17 +326,22 @@ if(NOT Module_vtkDICOM)
else()
set(VTK_LIBS vtkCommon vtkFiltering vtkImaging vtkIO vtkInfovis) # VTK 5.x
endif()
+endif()
+
+if(NOT Module_vtkDICOM AND VTK_VERSION VERSION_LESS 8.90)
+ # External wrapping previous to VTK 9
set(VTK_WRAP_INCLUDE_DIRS
${DICOM_INCLUDE_DIRS}
${VTK_WRAP_INCLUDE_DIRS})
# For the python wrappers
- if(BUILD_PYTHON_WRAPPERS AND
- TARGET vtkCommonCorePythonD OR
- TARGET vtkCommonKitPythonD OR
- TARGET vtkCommonPythonD)
- set(DICOM_PYTHON_LIBRARIES vtkDICOMPythonD)
+ if(BUILD_PYTHON_WRAPPERS)
+ if(TARGET vtkCommonCorePythonD OR
+ TARGET vtkCommonKitPythonD OR
+ TARGET vtkCommonPythonD)
+ set(DICOM_PYTHON_LIBRARIES vtkDICOMPythonD)
+ endif()
endif()
# For the tcl wrappers
@@ -378,8 +388,10 @@ if(MSVC_VERSION EQUAL 1400 OR MSVC_VERSION GREATER 1400 OR MSVC10)
add_definitions(-D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
endif()
-# The main library
-add_subdirectory(Source)
+if(NOT DICOM_EXTERNAL_BUILD OR NOT DEFINED VTK_MODULE_ENABLE_VTK_DICOM)
+ # The main library, if not handled by the VTK 9 functions
+ add_subdirectory(Source)
+endif()
# Subdirectories
if(BUILD_PROGRAMS)
@@ -391,7 +403,7 @@ if(BUILD_EXAMPLES)
add_subdirectory(Examples)
endif()
-if(NOT DEFINED VTK_MODULE_ENABLE_VTK_DICOM)
+if(DICOM_EXTERNAL_BUILD OR NOT DEFINED VTK_MODULE_ENABLE_VTK_DICOM)
if(BUILD_TESTING)
enable_testing()
=====================================
Source/CMakeLists.txt
=====================================
@@ -1,3 +1,15 @@
+# GDCM or DCMTK are required for reading compressed DICOM images
+option(USE_ITK_GDCM "Use ITK's GDCM for image decompression" OFF)
+option(USE_GDCM "Use GDCM for image decompression" OFF)
+option(USE_DCMTK "Use DCMTK for image decompression" OFF)
+
+# Check for sqlite3 for reading OsiriX databases
+set(USE_SQLITE_DEFAULT OFF)
+if(APPLE)
+ set(USE_SQLITE_DEFAULT ON)
+endif()
+option(USE_SQLITE "Use SQLite for OsiriX databases" ${USE_SQLITE_DEFAULT})
+
# Configuration header
set(DICOM_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
set(DICOM_BUILD_TESTING ${BUILD_TESTING})
@@ -136,8 +148,54 @@ set_source_files_properties(${LIB_ABSTRACT}
set_source_files_properties(${LIB_PRIVATE_HDRS}
PROPERTIES SKIP_HEADER_INSTALL ON)
+# Third party library dependencies
+
+if(USE_ITK_GDCM)
+ # To avoid conflicts, we might want to use ITK's GDCM
+ find_package(ITK REQUIRED)
+ if(ITK_FOUND)
+ include(${ITK_USE_FILE})
+ set(GDCM_LIBS gdcmMSFF gdcmIOD gdcmDSED gdcmDICT)
+ set(GDCM_FOUND 1)
+ set(USE_GDCM ON CACHE BOOL "Use GDCM for image decompression" FORCE)
+ endif()
+elseif(USE_GDCM)
+ find_package(GDCM)
+ if(NOT GDCM_DIR)
+ message(FATAL_ERROR "Please set GDCM_DIR.")
+ endif()
+ if(GDCM_FOUND)
+ include(${GDCM_USE_FILE})
+ set(GDCM_LIBS gdcmMSFF gdcmIOD gdcmDSED gdcmDICT)
+ endif()
+endif()
+
+set(DCMTK_LIBS)
+if(USE_DCMTK)
+ find_package(DCMTK)
+ if(NOT DCMTK_FOUND)
+ message(FATAL_ERROR "DCMTK not found or incomplete.")
+ endif()
+ if(${DCMTK_charls_LIBRARY})
+ set(DCMTK_LIBS ${DCMTK_LIBRARIES} ${DCMTK_charls_LIBRARY})
+ else()
+ set(DCMTK_LIBS ${DCMTK_LIBRARIES})
+ endif()
+ if(APPLE)
+ list(APPEND DCMTK_LIBS iconv)
+ endif()
+ include_directories(${DCMTK_INCLUDE_DIRS})
+endif()
+
+set(SQLITE_LIBS)
+if(USE_SQLITE)
+ set(SQLITE_LIBS sqlite3)
+endif()
+
+# Create the library
+
if(DEFINED VTK_MODULE_ENABLE_VTK_DICOM)
- # When building as a remote module for VTK 9 (or VTK 8.90+)
+ # When building as a module for VTK 8.90 or later
set(LIB_SRC_HDRS)
foreach(_src ${LIB_SRCS})
get_filename_component(_base ${_src} NAME_WE)
@@ -156,6 +214,7 @@ elseif(Module_vtkDICOM)
LINK_PRIVATE ${GDCM_LIBS} ${DCMTK_LIBS} ${SQLITE_LIBS})
else()
+# The remainder of the file is for old, non-modular builds
configure_file(${DICOM_CMAKE_DIR}/vtkDICOMModule.h.in
"${CMAKE_CURRENT_BINARY_DIR}/vtkDICOMModule.h" COPYONLY)
@@ -420,4 +479,4 @@ endif()
install(FILES ${LIB_HDRS}
DESTINATION ${DICOM_INCLUDE_INSTALL_DEST} COMPONENT Development)
-endif() # else MODULE_vtkDICOM
+endif()
=====================================
Source/dicom.module
=====================================
@@ -0,0 +1,18 @@
+NAME
+ VTK::DICOM
+LIBRARY_NAME
+ vtkDICOM
+GROUPS
+ StandAlone
+DEPENDS
+ VTK::CommonCore
+ VTK::CommonDataModel
+ VTK::CommonExecutionModel
+ VTK::IOImage
+PRIVATE_DEPENDS
+ VTK::CommonMisc
+ VTK::ImagingCore
+ VTK::IOCore
+ VTK::zlib
+TEST_DEPENDS
+ VTK::TestingCore
=====================================
Source/vtkDICOMDictHash.cxx
=====================================
The diff for this file was not included because it is too large.
=====================================
Source/vtkDICOMDictHash.h
=====================================
@@ -19,6 +19,9 @@ ImplementationVersionName = 0x00020013, // SH M1 0
SourceApplicationEntityTitle = 0x00020016, // AE M1 0
SendingApplicationEntityTitle = 0x00020017, // AE M1 0
ReceivingApplicationEntityTitle = 0x00020018, // AE M1 0
+SourcePresentationAddress = 0x00020026, // UR M1 0
+SendingPresentationAddress = 0x00020027, // UR M1 0
+ReceivingPresentationAddress = 0x00020028, // UR M1 0
RTVMetaInformationVersion = 0x00020031, // OB M1 0
RTVCommunicationSOPClassUID = 0x00020032, // UI M1 0
RTVCommunicationSOPInstanceUID = 0x00020033, // UI M1 0
@@ -242,6 +245,7 @@ AnatomicLocationOfExaminingInstrumentCodeSequenceTrial = 0x00082259, // SQ M1
AnatomicStructureSpaceOrRegionModifierCodeSequenceTrial = 0x0008225A, // SQ M1 1
OnAxisBackgroundAnatomicStructureCodeSequenceTrial = 0x0008225C, // SQ M1 1
AlternateRepresentationSequence = 0x00083001, // SQ M1 0
+AvailableTransferSyntaxUID = 0x00083002, // UI M1TN 0
IrradiationEventUID = 0x00083010, // UI M1TN 0
SourceIrradiationEventSequence = 0x00083011, // SQ M1 0
RadiopharmaceuticalAdministrationEventUID = 0x00083012, // UI M1 0
=====================================
Source/vtkDICOMDirectory.cxx
=====================================
@@ -1061,7 +1061,7 @@ void vtkDICOMDirectory::AddSeriesFileNames(
}
else if (n < 0 || study != n-1)
{
- vtkErrorMacro("AddSeriesFileNames: non-monotonically increasing study")
+ vtkErrorMacro("AddSeriesFileNames: non-monotonically increasing study");
return;
}
@@ -1092,7 +1092,7 @@ void vtkDICOMDirectory::AddSeriesFileNames(
}
else
{
- vtkErrorMacro("AddSeriesFileNames: non-monotonically increasing patient")
+ vtkErrorMacro("AddSeriesFileNames: non-monotonically increasing patient");
return;
}
=====================================
Source/vtkDICOMFile.cxx
=====================================
@@ -231,12 +231,16 @@ size_t vtkDICOMFile::Read(unsigned char *data, size_t len)
this->Error = UnknownError;
break;
}
- else if (r == 0)
+ n += r;
+ if (n == 0)
{
this->Eof = true;
break;
}
- n += r;
+ else if (r < l)
+ {
+ break;
+ }
}
return n;
#else
=====================================
Source/vtkDICOMFileSorter.cxx
=====================================
@@ -217,7 +217,7 @@ void vtkDICOMFileSorter::AddSeriesFileNames(int study, vtkStringArray *files)
}
else
{
- vtkErrorMacro("AddSeriesFileNames: non-monotonically increasing study")
+ vtkErrorMacro("AddSeriesFileNames: non-monotonically increasing study");
}
this->Series->push_back(files);
=====================================
Source/vtkDICOMReader.h
=====================================
@@ -152,7 +152,7 @@ public:
//! If the files have been pre-sorted, the sorting can be disabled.
vtkGetMacro(Sorting, int);
vtkSetMacro(Sorting, int);
- vtkBooleanMacro(Sorting, int)
+ vtkBooleanMacro(Sorting, int);
//@}
//@{
=====================================
Source/vtkDICOMUtilitiesUIDTable.cxx
=====================================
@@ -23,15 +23,15 @@ const UIDTableEntry UIDTable[] = {
{ 218, 1, 2, 0, 0 },
{ 219, 1, 1, 0, 0 },
{ 1265, 1, 1, 0, 0 },
-{ 2569, 1, 1, 0, 0 },
-{ 2572, 1, 1, 0, 0 },
-{ 2574, 24, 1, 0, 0 },
-{ 2598, 4, 1, 0, 0 },
+{ 2571, 1, 1, 0, 0 },
+{ 2574, 1, 1, 0, 0 },
+{ 2576, 24, 1, 0, 0 },
+{ 2600, 4, 1, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0 },
-{ 2602, 2, 0, 0, 0 },
+{ 2604, 2, 0, 0, 0 },
{ 0, 0, 0, 0, // 1.2.840.10008.1.1
"Verification SOP Class" },
{ 58, 7, 1, 0, // 1.2.840.10008.1.2
@@ -1653,7 +1653,7 @@ const UIDTableEntry UIDTable[] = {
"Implant Template Group Information Model - MOVE" },
{ 0, 0, 0, 0, // 1.2.840.10008.5.1.4.45.4
"Implant Template Group Information Model - GET" },
-{ 1266, 1303, 1, 0, 0 },
+{ 1266, 1305, 1, 0, 0 },
{ 0, 0, 0, 2, // 1.2.840.10008.6.1.1
"Anatomic Modifier" },
{ 0, 0, 0, 4, // 1.2.840.10008.6.1.2
@@ -4154,12 +4154,16 @@ const UIDTableEntry UIDTable[] = {
"Radiotherapy Treatment Planning Person Roles" },
{ 0, 0, 0, 7070, // 1.2.840.10008.6.1.1303
"Real Time Video Rendition Titles" },
-{ 2570, 2, 1, 0, 0 },
+{ 0, 0, 0, 219, // 1.2.840.10008.6.1.1304
+ "Geometry Graphical Representation" },
+{ 0, 0, 0, 217, // 1.2.840.10008.6.1.1305
+ "Visual Explanation" },
+{ 2572, 2, 1, 0, 0 },
{ 0, 0, 0, 0, // 1.2.840.10008.7.1.1
"Native DICOM Model" },
{ 0, 0, 0, 0, // 1.2.840.10008.7.1.2
"Abstract Multi-Dimensional Image Model" },
-{ 2573, 1, 1, 0, 0 },
+{ 2575, 1, 1, 0, 0 },
{ 0, 0, 0, 0, // 1.2.840.10008.8.1.1
"DICOM Content Mapping Resource" },
{ 0, 0, 0, 0, // 1.2.840.10008.9.1
@@ -4218,10 +4222,10 @@ const UIDTableEntry UIDTable[] = {
"Audio Waveform Real-Time Communication" },
{ 0, 0, 0, 0, // 1.2.840.10008.10.4
"Rendition Selection Document Real-Time Communication" },
-{ 2604, 2, 3, 0, 0 },
-{ 2645, 1, 1, 0, 0 },
-{ 2606, 31, 1, 0, 0 },
-{ 2637, 8, 1, 0, 0 },
+{ 2606, 2, 3, 0, 0 },
+{ 2647, 1, 1, 0, 0 },
+{ 2608, 31, 1, 0, 0 },
+{ 2639, 8, 1, 0, 0 },
{ 0, 0, 0, 0, // 1.2.840.10008.15.0.3.1
"dicomDeviceName" },
{ 0, 0, 0, 0, // 1.2.840.10008.15.0.3.2
=====================================
Testing/CMakeLists.txt
=====================================
@@ -12,7 +12,7 @@ set(TEST_SRCS
TestDICOMVR.cxx
)
-if(DEFINED VTK_MODULE_ENABLE_VTK_DICOM)
+if(DEFINED VTK_MODULE_ENABLE_VTK_DICOM AND NOT DICOM_EXTERNAL_BUILD)
# When building as a remote module for VTK 9 (or VTK 8.90+)
vtk_add_test_cxx(vtkDICOMCxxTests TEST_NAMES NO_VALID ${TEST_SRCS})
vtk_test_cxx_executable(vtkDICOMCxxTests TEST_NAMES)
@@ -26,7 +26,7 @@ else()
include_directories(${DICOM_INCLUDE_DIRS})
-set(BASE_LIBS vtkDICOM ${VTK_LIBS})
+set(BASE_LIBS ${VTK_DICOM_LINK_TARGET} ${VTK_LIBS})
foreach(_src ${TEST_SRCS})
get_filename_component(_test ${_src} NAME_WE)
@@ -36,9 +36,20 @@ foreach(_src ${TEST_SRCS})
add_test(${_test} ${_pth}/${_test})
endforeach()
+# For VTK 9 and up, executable targets use VTK:: namespace prefix
+if(VTK_VERSION VERSION_LESS 8.90)
+ set(_vtk vtk)
+ set(_python_module_path "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+else()
+ set(_vtk VTK::)
+ get_target_property(_python_module_path vtkDICOMPython
+ LIBRARY_OUTPUT_DIRECTORY)
+endif()
+
if(BUILD_PYTHON_WRAPPERS)
if(NOT VTK_PYTHON_EXE)
- get_target_property(WRAP_PYTHON_PATH vtkWrapPython LOCATION_<CONFIG>)
+ get_target_property(WRAP_PYTHON_PATH ${_vtk}WrapPython
+ LOCATION_<CONFIG>)
get_filename_component(VTK_EXE_DIR ${WRAP_PYTHON_PATH} PATH)
find_program(VTK_PYTHON_EXE vtkpython "${VTK_EXE_DIR}")
endif()
@@ -52,7 +63,7 @@ if(BUILD_PYTHON_WRAPPERS)
"${CMAKE_CURRENT_SOURCE_DIR}/TestDICOMPython.py")
if(NOT CMAKE_CONFIGURATION_TYPES)
set_tests_properties(TestDICOMPython PROPERTIES ENVIRONMENT
- "PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+ "PYTHONPATH=${_python_module_path}")
endif()
endif()
=====================================
Utilities/nemadict.txt
=====================================
@@ -58,6 +58,24 @@ ReceivingApplicationEntityTitle
AE
1
+(0002,0026)
+Source Presentation Address
+SourcePresentationAddress
+UR
+1
+
+(0002,0027)
+Sending Presentation Address
+SendingPresentationAddress
+UR
+1
+
+(0002,0028)
+Receiving Presentation Address
+ReceivingPresentationAddress
+UR
+1
+
(0002,0031)
RTV Meta Information Version
RTVMetaInformationVersion
@@ -1396,6 +1414,12 @@ AlternateRepresentationSequence
SQ
1
+(0008,3002)
+Available Transfer Syntax UID
+AvailableTransferSyntaxUID
+UI
+1-n
+
(0008,3010)
Irradiation Event UID
IrradiationEventUID
=====================================
Utilities/nemauids.txt
=====================================
@@ -5432,3 +5432,9 @@ Radiotherapy Treatment Planning Person Roles
1.2.840.10008.6.1.1303
CID 7070
Real Time Video Rendition Titles
+1.2.840.10008.6.1.1304
+CID 219
+Geometry Graphical Representation
+1.2.840.10008.6.1.1305
+CID 217
+Visual Explanation
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+vtk-dicom (0.8.12-1) UNRELEASED; urgency=medium
+
+ * New upstream version 0.8.12
+
+ -- Gert Wollny <gewo at debian.org> Fri, 20 Dec 2019 21:13:31 +0100
+
vtk-dicom (0.8.11-3) unstable; urgency=medium
* d/control: Update build-dep to libgdcm-dev
View it on GitLab: https://salsa.debian.org/med-team/vtk-dicom/compare/b6e78eebc13a9c29bcf8164bb319069f926c2723...3e2c56c48100a4cc3175dd24fa7a8a7a9bda3aec
--
View it on GitLab: https://salsa.debian.org/med-team/vtk-dicom/compare/b6e78eebc13a9c29bcf8164bb319069f926c2723...3e2c56c48100a4cc3175dd24fa7a8a7a9bda3aec
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191220/d284e049/attachment-0001.html>
More information about the debian-med-commit
mailing list