[med-svn] [dicom3tools] 01/04: New upstream version 1.00~20171209092658
Gert Wollny
gewo at moszumanska.debian.org
Sun Jan 7 16:26:53 UTC 2018
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository dicom3tools.
commit 2c19f536a72758da681132476df5d01d6d53fc77
Author: Gert Wollny <gewo at debian.org>
Date: Sun Jan 7 16:31:47 2018 +0100
New upstream version 1.00~20171209092658
---
CHANGES | 6 ++++++
VERSION | 2 +-
libsrc/src/generic/platform.cc | 2 +-
libsrc/src/generic/version.cc | 2 +-
libsrc/standard/condn.tpl | 14 +++++++++++---
libsrc/standard/elmdict/other.tpl | 5 +++++
libsrc/standard/module/ct.tpl | 4 ++++
libsrc/standard/module/mr.tpl | 8 +++++++-
libsrc/standard/module/pet.tpl | 4 ++++
libsrc/standard/module/us.tpl | 4 ++--
10 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/CHANGES b/CHANGES
index 1b4321f..ac0f2b5 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+171209: libsrc/standard/elmdict/other.tpl: Add observed explict VR of more Brainlab private data elements
+
+171209: libsrc/standard/module/mr.tpl: Correct number of sequence items in ReferencedInstanceSequence in Tractography Module (000515)
+
+171120: libsrc/standard/condn.tpl,module/ct.tpl,mr.tpl,pet.tpl,us.tpl: Add usage of Temporal Position Macro as needed for Enhanced MR, Enhanced CT, Enhanced PET and related Legacy objects (CP 1189)
+
171115: libsrc/include/dctool/ie.h,src/dctool/ie.cc,standard/condn.tpl,elmdict/dicom3.tpl,iodcomp,module/mr.tpl: Add Tractography Results Storage SOP Class (Sup 181) as well as missing IE descriptions
170919: libsrc/standard/module/base.tpl: Clarify condition for Repetition Time (0018,0080) (CP 1696)
diff --git a/VERSION b/VERSION
index 58ffbd4..f294cf5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.snapshot.20171115151618
+1.00.snapshot.20171209092658
diff --git a/libsrc/src/generic/platform.cc b/libsrc/src/generic/platform.cc
index 57ccead..579ec1c 100644
--- a/libsrc/src/generic/platform.cc
+++ b/libsrc/src/generic/platform.cc
@@ -4,4 +4,4 @@
#include "platform.h"
-const char* dicom3tools_platform_string = "Darwin graytoo.local 14.5.0 Darwin Kernel Version 14.5.0: Tue Apr 11 16:12:42 PDT 2017; root:xnu-2782.50.9.2.3~1/RELEASE_X86_64 x86_64";
+const char* dicom3tools_platform_string = "Darwin graytoo.local 14.5.0 Darwin Kernel Version 14.5.0: Sun Jun 4 21:40:08 PDT 2017; root:xnu-2782.70.3~1/RELEASE_X86_64 x86_64";
diff --git a/libsrc/src/generic/version.cc b/libsrc/src/generic/version.cc
index 3dc459c..ab7ae20 100644
--- a/libsrc/src/generic/version.cc
+++ b/libsrc/src/generic/version.cc
@@ -4,4 +4,4 @@
#include "version.h"
-const char* dicom3tools_version_string = "1.00.snapshot.20171115151618";
+const char* dicom3tools_version_string = "1.00.snapshot.20171209092658";
diff --git a/libsrc/standard/condn.tpl b/libsrc/standard/condn.tpl
index 5186196..87c109d 100755
--- a/libsrc/standard/condn.tpl
+++ b/libsrc/standard/condn.tpl
@@ -4594,17 +4594,26 @@ Condition="PatientOrientationInFrameMacroOKInPerFrameFunctionalGroupSequence"
Element="PatientOrientationInFrameSequence" Operator="And" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
ConditionEnd
-
Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
Element="TemporalPositionSequence" Modifier="Not" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
Element="TemporalPositionSequence" Operator="And" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
+ConditionEnd
+
+Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
+ Element="TemporalPositionSequence" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
+ Element="TemporalPositionSequence" Operator="And" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
+ConditionEnd
+
+Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequenceAndNotCardiacOrRespiratoryEvent"
+ Element="TemporalPositionSequence" Modifier="Not" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
+ Element="TemporalPositionSequence" Operator="And" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
Element="CardiacSynchronizationSequence" Operator="And" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
Element="CardiacSynchronizationSequence" Operator="And" Modifier="Not" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
Element="RespiratorySynchronizationSequence" Operator="And" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
Element="RespiratorySynchronizationSequence" Operator="And" Modifier="Not" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
ConditionEnd
-Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
+Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequenceAndNotCardiacOrRespiratoryEvent"
Element="TemporalPositionSequence" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
Element="TemporalPositionSequence" Operator="And" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
Element="CardiacSynchronizationSequence" Operator="And" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
@@ -4613,7 +4622,6 @@ Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
Element="RespiratorySynchronizationSequence" Operator="And" Modifier="Not" ElementPresentInPathFromRootFirstItem="PerFrameFunctionalGroupsSequence"
ConditionEnd
-
Condition="FrameVOILUTSequenceNotInSharedFunctionalGroupSequence"
Element="FrameVOILUTSequence" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
ConditionEnd
diff --git a/libsrc/standard/elmdict/other.tpl b/libsrc/standard/elmdict/other.tpl
index 34c7bb3..3630ab5 100755
--- a/libsrc/standard/elmdict/other.tpl
+++ b/libsrc/standard/elmdict/other.tpl
@@ -2085,6 +2085,9 @@
(6001,00aa) VERS="SVIS" VR="IS" VM="1" Owner="SCIVIS-1" Keyword="?" Name="?"
(6001,00ab) VERS="SVIS" VR="ST" VM="1" Owner="SCIVIS-1" Keyword="?" Name="?"
+(0009,0021) VERS="BLB" VR="UL" VM="1" Owner="Brainlab-S9-History" Keyword="?" Name="?"
+(0009,0024) VERS="BLB" VR="UL" VM="1" Owner="Brainlab-S9-History" Keyword="?" Name="?"
+(0009,0030) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S9-History" Keyword="?" Name="?"
(0009,0031) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S9-History" Keyword="?" Name="?"
(0009,0032) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S9-History" Keyword="?" Name="?"
(0009,0033) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S9-History" Keyword="?" Name="?"
@@ -2092,6 +2095,8 @@
(0063,0001) VERS="BLB" VR="LO" VM="1" Owner="Brainlab-S32-SO" Keyword="?" Name="?"
(0063,0010) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S32-SO" Keyword="?" Name="?"
+(0067,0004) VERS="BLB" VR="CS" VM="1" Owner="Brainlab-S14-SSO" Keyword="?" Name="?"
+
(0073,0010) VERS="BLB" VR="SQ" VM="1" Owner="Brainlab-S23-ProjectiveFusion" Keyword="ProjectiveRegistrationSequence" Name="Projective Registration Sequence"
(7029,0010) VERS="CTPD" VR="US" VM="1" Owner="CT IMG ACQUISITION" Keyword="NumberofDetectorRows" Name="NumberofDetectorRows"
diff --git a/libsrc/standard/module/ct.tpl b/libsrc/standard/module/ct.tpl
index 9c6d202..6d7df42 100644
--- a/libsrc/standard/module/ct.tpl
+++ b/libsrc/standard/module/ct.tpl
@@ -224,6 +224,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedCTImage"
InvokeMacro="CTXRayDetailsMacro" Condition="NeedCTXRayDetailsMacroInSharedFunctionalGroupSequence"
InvokeMacro="CTPixelValueTransformationMacro" Condition="PixelValueTransformationSequenceNotInPerFrameFunctionalGroupSequence"
InvokeMacro="CTAdditionalXRaySourceMacro" Condition="CTAdditionalXRaySourceMacroInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
SequenceEnd
Sequence="PerFrameFunctionalGroupsSequence" Type="1" VM="1-n"
@@ -251,6 +252,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedCTImage"
InvokeMacro="CTXRayDetailsMacro" Condition="NeedCTXRayDetailsMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="CTPixelValueTransformationMacro" Condition="PixelValueTransformationSequenceNotInSharedFunctionalGroupSequence"
InvokeMacro="CTAdditionalXRaySourceMacro" Condition="CTAdditionalXRaySourceMacroInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
SequenceEnd
ModuleEnd
@@ -269,6 +271,7 @@ Module="MultiFrameFunctionalGroupsForLegacyConvertedEnhancedCTImage"
InvokeMacro="IrradiationEventIdentificationMacro" Condition="IrradiationEventIdentificationMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="CTImageFrameTypeMacro" Condition="CTImageFrameTypeSequenceNotInPerFrameFunctionalGroupSequence"
InvokeMacro="CTPixelValueTransformationMacro" Condition="PixelValueTransformationSequenceOKInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="UnassignedSharedConvertedAttributesMacro"
SequenceEnd
@@ -287,6 +290,7 @@ Module="MultiFrameFunctionalGroupsForLegacyConvertedEnhancedCTImage"
InvokeMacro="IrradiationEventIdentificationMacro" Condition="IrradiationEventIdentificationMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="CTImageFrameTypeMacro" Condition="CTImageFrameTypeSequenceNotInSharedFunctionalGroupSequence"
InvokeMacro="CTPixelValueTransformationMacro" Condition="PixelValueTransformationSequenceOKInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="UnassignedPerFrameConvertedAttributesMacro"
InvokeMacro="ImageFrameConversionSourceMacro" Condition="ImageFrameConversionSourceMacroPresentInPerFrameFunctionalGroupSequence"
SequenceEnd
diff --git a/libsrc/standard/module/mr.tpl b/libsrc/standard/module/mr.tpl
index c512c27..2d0b466 100755
--- a/libsrc/standard/module/mr.tpl
+++ b/libsrc/standard/module/mr.tpl
@@ -277,6 +277,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedMRImage"
InvokeMacro="MRMetaboliteMapMacro" Condition="NeedMRMetaboliteMapMacroInSharedFunctionalGroupSequence"
InvokeMacro="MRVelocityEncodingMacro" Condition="NeedMRVelocityEncodingMacroInSharedFunctionalGroupSequence"
InvokeMacro="MRArterialSpinLabelingMacro" Condition="NeedMRArterialSpinLabelingMacroInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
SequenceEnd
Sequence="PerFrameFunctionalGroupsSequence" Type="1" VM="1-n"
InvokeMacro="PixelMeasuresMacro" Condition="PixelMeasuresSequenceNotInSharedFunctionalGroupSequence"
@@ -306,6 +307,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedMRImage"
InvokeMacro="MRMetaboliteMapMacro" Condition="NeedMRMetaboliteMapMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="MRVelocityEncodingMacro" Condition="NeedMRVelocityEncodingMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="MRArterialSpinLabelingMacro" Condition="NeedMRArterialSpinLabelingMacroInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
SequenceEnd
ModuleEnd
@@ -353,6 +355,7 @@ Module="MultiFrameFunctionalGroupsForMRSpectroscopy"
InvokeMacro="MRAveragesMacro" Condition="NeedMRAveragesMacroInSharedFunctionalGroupSequence"
InvokeMacro="MRSpatialSaturationMacro" Condition="NeedMRSpatialSaturationMacroInSharedFunctionalGroupSequence"
InvokeMacro="MRVelocityEncodingMacro" Condition="NeedMRVelocityEncodingMacroInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
SequenceEnd
Sequence="PerFrameFunctionalGroupsSequence" Type="1" VM="1-n"
InvokeMacro="PixelMeasuresMacro" Condition="PixelMeasuresSequenceNotInSharedFunctionalGroupSequence"
@@ -376,6 +379,7 @@ Module="MultiFrameFunctionalGroupsForMRSpectroscopy"
InvokeMacro="MRAveragesMacro" Condition="NeedMRAveragesMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="MRSpatialSaturationMacro" Condition="NeedMRSpatialSaturationMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="MRVelocityEncodingMacro" Condition="NeedMRVelocityEncodingMacroInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
SequenceEnd
ModuleEnd
@@ -553,6 +557,7 @@ Module="MultiFrameFunctionalGroupsForLegacyConvertedEnhancedMRImage"
InvokeMacro="ContrastBolusUsageMacro" Condition="NeedContrastBolusUsageMacroInSharedFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="MRImageFrameTypeMacro" Condition="MRImageFrameTypeSequenceNotInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="UnassignedSharedConvertedAttributesMacro"
SequenceEnd
@@ -571,6 +576,7 @@ Module="MultiFrameFunctionalGroupsForLegacyConvertedEnhancedMRImage"
InvokeMacro="ContrastBolusUsageMacro" Condition="NeedContrastBolusUsageMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="MRImageFrameTypeMacro" Condition="MRImageFrameTypeSequenceNotInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="UnassignedPerFrameConvertedAttributesMacro"
InvokeMacro="ImageFrameConversionSourceMacro" Condition="ImageFrameConversionSourceMacroPresentInPerFrameFunctionalGroupSequence"
SequenceEnd
@@ -682,7 +688,7 @@ Module="TractographyResults"
SequenceEnd
SequenceEnd
- Sequence="ReferencedInstanceSequence" Type="1C" VM="1"
+ Sequence="ReferencedInstanceSequence" Type="1C" VM="1-n" NoCondition=""
InvokeMacro="ImageSOPInstanceReferenceMacro"
SequenceEnd
ModuleEnd
diff --git a/libsrc/standard/module/pet.tpl b/libsrc/standard/module/pet.tpl
index f46fba0..eff7d9f 100755
--- a/libsrc/standard/module/pet.tpl
+++ b/libsrc/standard/module/pet.tpl
@@ -143,6 +143,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedPETImage"
InvokeMacro="PETFrameCorrectionFactorsMacro" Condition="NeedPETFrameCorrectionFactorsMacroInSharedFunctionalGroupSequence"
InvokeMacro="PETReconstructionMacro" Condition="NeedPETReconstructionMacroInSharedFunctionalGroupSequence"
InvokeMacro="PETTableDynamicsMacro" Condition="NeedPETTableDynamicsMacroInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
SequenceEnd
Sequence="PerFrameFunctionalGroupsSequence" Type="1" VM="1-n"
InvokeMacro="PixelMeasuresMacro" Condition="PixelMeasuresSequenceNotInSharedFunctionalGroupSequence"
@@ -166,6 +167,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedPETImage"
InvokeMacro="PETFrameCorrectionFactorsMacro" Condition="NeedPETFrameCorrectionFactorsMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="PETReconstructionMacro" Condition="NeedPETReconstructionMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="PETTableDynamicsMacro" Condition="NeedPETTableDynamicsMacroInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
SequenceEnd
ModuleEnd
@@ -184,6 +186,7 @@ Module="MultiFrameFunctionalGroupsForLegacyConvertedEnhancedPETImage"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="IrradiationEventIdentificationMacro" Condition="IrradiationEventIdentificationMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="PETFrameTypeMacro" Condition="PETFrameTypeSequenceNotInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="UnassignedSharedConvertedAttributesMacro"
SequenceEnd
@@ -202,6 +205,7 @@ Module="MultiFrameFunctionalGroupsForLegacyConvertedEnhancedPETImage"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="IrradiationEventIdentificationMacro" Condition="IrradiationEventIdentificationMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="PETFrameTypeMacro" Condition="PETFrameTypeSequenceNotInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="UnassignedPerFrameConvertedAttributesMacro"
InvokeMacro="ImageFrameConversionSourceMacro" Condition="ImageFrameConversionSourceMacroPresentInPerFrameFunctionalGroupSequence"
SequenceEnd
diff --git a/libsrc/standard/module/us.tpl b/libsrc/standard/module/us.tpl
index f8ed645..85c83d2 100644
--- a/libsrc/standard/module/us.tpl
+++ b/libsrc/standard/module/us.tpl
@@ -228,7 +228,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedUSVolume"
InvokeMacro="FrameDisplayShutterMacro" Condition="FrameDisplayShutterMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="NeedRespiratorySynchronizationMacroInSharedFunctionalGroupSequenceRegardlessOfImageType"
InvokeMacro="PlaneOrientationVolumeMacro"
- InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInSharedFunctionalGroupSequenceAndNotCardiacOrRespiratoryEvent"
InvokeMacro="ImageDataTypeMacro" Condition="ImageDataTypeSequenceNotInPerFrameFunctionalGroupSequence"
InvokeMacro="USImageDescriptionMacro"
InvokeMacro="USImageDescriptionMacroForEnhancedUSVolume"
@@ -249,7 +249,7 @@ Module="MultiFrameFunctionalGroupsForEnhancedUSVolume"
InvokeMacro="FrameDisplayShutterMacro" Condition="FrameDisplayShutterMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="NeedRespiratorySynchronizationMacroInPerFrameFunctionalGroupSequenceRegardlessOfImageType"
InvokeMacro="PlanePositionVolumeMacro"
- InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequence"
+ InvokeMacro="TemporalPositionMacro" Condition="TemporalPositionMacroOKInPerFrameFunctionalGroupSequenceAndNotCardiacOrRespiratoryEvent"
InvokeMacro="ImageDataTypeMacro" Condition="ImageDataTypeSequenceNotInSharedFunctionalGroupSequence"
SequenceEnd
ModuleEnd
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicom3tools.git
More information about the debian-med-commit
mailing list