[med-svn] [dicom3tools] 01/05: New upstream version 1.00~20170222075252
Gert Wollny
gert-guest at moszumanska.debian.org
Sat Mar 4 11:40:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository dicom3tools.
commit 5df89f94ffb385004914e5667581dfaa9e881881
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Sat Mar 4 10:31:31 2017 +0000
New upstream version 1.00~20170222075252
---
CHANGES | 18 +++++++
VERSION | 2 +-
libsrc/src/generic/version.cc | 2 +-
libsrc/standard/condn.tpl | 21 ++++++--
libsrc/standard/elmdict/dicom3.tpl | 4 ++
libsrc/standard/elmdict/other.tpl | 106 ++++++++++++++++++++++++++++++++-----
libsrc/standard/iodcomp/base.tpl | 1 +
libsrc/standard/module/base.tpl | 17 +++++-
libsrc/standard/module/ct.tpl | 6 +++
libsrc/standard/module/vl.tpl | 6 +--
libsrc/standard/strval/base.tpl | 1 +
11 files changed, 162 insertions(+), 22 deletions(-)
diff --git a/CHANGES b/CHANGES
index 6cca10e..d81b490 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,21 @@
+170222: libsrc/standard/elmdict/other.tpl,strval/base.tpl: Add NUMA R-RDSR private data elements and private coding scheme
+
+170207: libsrc/standard/condn.tpl,module/base.tpl,iod/base.tpl: Add Palette Color LUT to IOD to finish applying Palette Color in Parametric Map (CP 1584)
+
+170130: libsrc/standard/elmdict/dicom3.tpl,module/base.tpl: Add genetic modifications to patient (CP 1619)
+
+170130: libsrc/standard/condn.tpl,module/base.tpl,ct.tpl: Should warn if optional phantom type is missing for CTDIvol (000505)
+
+170130: libsrc/standard/condn.tpl,module/base.tpl,ct.tpl: Add water equivalent diameter to CT (CP 1525)
+
+170130: libsrc/standard/module/base.tpl,ct.tpl: Add Dose Area Product to CT (CP 1455)
+
+170127: libsrc/standard/module/base.tpl: Correct TR condition in legacy MR image to match current standard, i.e., if SK rather than if no SK (per discussion of cp_wc09); not yet mbpo until CP approved (000504)
+
+170118: libsrc/standard/module/vl.tpl: Move Horizontal Field of View in Ophthalmic Acquisition Parameters Macro to Ophthalmic Photography Acquisition Parameters Module (NB. was incorrectly omitted from Ophthalmic Photography Acquisition Parameters Module in 2011 when factoring out per Sup 110 but will be put back in 2017a)
+
+170109: libsrc/standard/elmdict/other.tpl: Update Sound Eklin TruDR private data elements ... conflict in different statements (TruDR vs. VetPACS) whether owner is "Sound Eklin" or "Sound Technologies", and whether VR for acquisition elements is LO or CS ... assume longer VR, and duplicate all for both owner strings
+
170109: libsrc/standard/elmdict/other.tpl: Add Sound Eklin TruDR private data elements from conformance statement and sample
161206: libsrc/src/standard/iodcomp,module/sr.tpl: Add IHEXDSIManifest profile option for dciodvy to check for additional retrieve location attributes required by IHE XDS-I Profile Manifest (000501)
diff --git a/VERSION b/VERSION
index e8820cf..98866a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.snapshot.20170109062447
+1.00.snapshot.20170222075252
diff --git a/libsrc/src/generic/version.cc b/libsrc/src/generic/version.cc
index 833b3a3..f8b79f9 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.20170109062447";
+const char* dicom3tools_version_string = "1.00.snapshot.20170222075252";
diff --git a/libsrc/standard/condn.tpl b/libsrc/standard/condn.tpl
index 0c5f68d..b8406da 100755
--- a/libsrc/standard/condn.tpl
+++ b/libsrc/standard/condn.tpl
@@ -967,9 +967,9 @@ Condition="DXPatientOrientationRequired"
) Operator="Or" Modifier="Not"
ConditionEnd
-Condition="MRIsNotEchoPlanarNotSegmentedKSpace"
+Condition="MRIsNotEchoPlanarOrIsSegmentedKSpace"
Element="ScanningSequence" Modifier="Not" ValueSelector="*" StringValue="EP"
- Element="SequenceVariant" Operator="Or" Modifier="Not" ValueSelector="*" StringValue="SK"
+ Element="SequenceVariant" Operator="Or" ValueSelector="*" StringValue="SK"
ConditionEnd
Condition="MRIsInversionRecovery"
@@ -6704,12 +6704,27 @@ Condition="PixelPresentationIsColorRangeAndPaletteColorLookupTableModuleAbsent"
) Operator="And" Modifier="Not"
ConditionEnd
+Condition="PixelPresentationIsColorRangeAndPaletteColorLookupTableUIDAbsent"
+ Element="PixelPresentation" StringValue="COLOR_RANGE"
+ Element="PaletteColorLookupTableUID" Operator="And" Modifier="Not" ElementPresent=""
+ConditionEnd
+
Condition="StoredValueColorRangeSequenceNotInPerFrameFunctionalGroupSequenceAndPixelPresentationIsColorRange"
Element="StoredValueColorRangeSequence" Modifier="Not" ElementPresentInPathFromRoot="PerFrameFunctionalGroupsSequence"
Element="PixelPresentation" Operator="And" StringValueFromRootAttribute="COLOR_RANGE"
ConditionEnd
-Condition="StoredValueColorRangeSequenceeNotInSharedFunctionalGroupSequenceAndPixelPresentationIsColorRange"
+Condition="StoredValueColorRangeSequenceNotInSharedFunctionalGroupSequenceAndPixelPresentationIsColorRange"
Element="StoredValueColorRangeSequence" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
Element="PixelPresentation" Operator="And" StringValueFromRootAttribute="COLOR_RANGE"
ConditionEnd
+
+Condition="WaterEquivalentDiameterIsPresent"
+ Element="WaterEquivalentDiameter" ElementPresent=""
+ConditionEnd
+
+Condition="CTDIvolIsPresentButCTDIPhantomTypeCodeSequenceIsNot"
+ Element="CTDIvol" ElementPresent=""
+ Element="CTDIPhantomTypeCodeSequence" Operator="And" Modifier="Not" ElementPresent=""
+ConditionEnd
+
diff --git a/libsrc/standard/elmdict/dicom3.tpl b/libsrc/standard/elmdict/dicom3.tpl
index 44c8da7..81d0a77 100644
--- a/libsrc/standard/elmdict/dicom3.tpl
+++ b/libsrc/standard/elmdict/dicom3.tpl
@@ -310,6 +310,10 @@
(0010,0217) VERS="3" VR="LO" VM="1" Keyword="StrainSource" Name="Strain Source"
(0010,0218) VERS="3" VR="UT" VM="1" Keyword="StrainAdditionalInformation" Name="Strain Additional Information"
(0010,0219) VERS="3" VR="SQ" VM="1" Keyword="StrainCodeSequence" Name="Strain Code Sequence"
+(0010,0221) VERS="3" VR="SQ" VM="1" Keyword="GeneticModificationsSequence" Name="Genetic Modifications Sequence"
+(0010,0222) VERS="3" VR="UC" VM="1" Keyword="GeneticModificationsDescription" Name="Genetic Modifications Description"
+(0010,0223) VERS="3" VR="LO" VM="1" Keyword="GeneticModificationsNomenclature" Name="Genetic Modifications Nomenclature"
+(0010,0229) VERS="3" VR="SQ" VM="1" Keyword="GeneticModificationsCodeSequence" Name="Genetic Modifications Code Sequence"
(0010,1000) VERS="3" VR="LO" VM="1-n" Keyword="OtherPatientIDs" Name="Other Patient IDs"
(0010,1001) VERS="3" VR="PN" VM="1-n" Keyword="OtherPatientNames" Name="Other Patient Names"
(0010,1002) VERS="3" VR="SQ" VM="1" Keyword="OtherPatientIDsSequence" Name="Other Patient IDs Sequence"
diff --git a/libsrc/standard/elmdict/other.tpl b/libsrc/standard/elmdict/other.tpl
index 5191ad2..0a3dc8b 100755
--- a/libsrc/standard/elmdict/other.tpl
+++ b/libsrc/standard/elmdict/other.tpl
@@ -2178,16 +2178,98 @@
(0117,00b4) VERS="UCSF" VR="DS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
(0117,00b5) VERS="UCSF" VR="LO" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
-(f001,0002) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="PatientCategorySize" Name="Patient Category Size"
-(f001,0003) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="PatientSexExtended" Name="Patient Sex Extended"
-(f001,0004) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ImageView" Name="Image View"
-(f001,0005) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="AnatomyImaged" Name="Anatomy Imaged"
-(f001,0006) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ImageEnhancements" Name="Image Enhancements"
-(f001,0007) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="DetectorSettings" Name="Detector Settings"
-(f001,0008) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ApplicationVersion" Name="ApplicationVersion"
-(f001,0009) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ImageLateralityExtended" Name="Image Laterality Extended"
-(f001,000a) VERS="SND" VR="PN" VM="1" Owner="Sound Eklin" Keyword="ClientName" Name="Client Name"
-(f001,000c) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="?" Name="?"
-(f001,0011) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="Protocol" Name="Protocol"
-(f001,001e) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ReceptorBitsPerPixel" Name="Receptor Bits Per Pixel"
+#conflict in different statements (TruDR vs. VetPACS) whether owner is "Sound Eklin" or "Sound Technologies", and whether VR for acquisition elements is LO or CS ... assume longer VR, and duplicate all for both owner strings ...
+(f001,0002) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="PatientCategorySize" Name="Patient Category Size"
+(f001,0003) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="PatientSexExtended" Name="Patient Sex Extended"
+(f001,0004) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ImageView" Name="Image View"
+(f001,0005) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="AnatomyImaged" Name="Anatomy Imaged"
+(f001,0006) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ImageEnhancements" Name="Image Enhancements"
+(f001,0007) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="DetectorSettings" Name="Detector Settings"
+(f001,0008) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ApplicationVersion" Name="Application Version"
+(f001,0009) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ImageLateralityExtended" Name="Image Laterality Extended"
+(f001,000a) VERS="SND" VR="PN" VM="1" Owner="Sound Eklin" Keyword="ClientName" Name="Client Name"
+(f001,000b) VERS="SND" VR="UI" VM="1" Owner="Sound Eklin" Keyword="ReferenceStudyInstanceUID" Name="Reference Study Instance UID"
+(f001,000c) VERS="SND" VR="UI" VM="1" Owner="Sound Eklin" Keyword="ReferenceSeriesInstanceUID" Name="Reference Series Instance UID"
+(f001,000d) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ExamRefId" Name="Exam Ref Id"
+(f001,000e) VERS="SND" VR="ST" VM="1" Owner="Sound Eklin" Keyword="PhysicianOfRecordAddress" Name="Physician of Record Address"
+(f001,000f) VERS="SND" VR="SH" VM="1-n" Owner="Sound Eklin" Keyword="PhysicianOfRecordPhoneNumbers" Name="Physician of Record Phone Numbers"
+(f001,0010) VERS="SND" VR="LT" VM="1" Owner="Sound Eklin" Keyword="ReasonForStudy" Name="Reason for Study"
+(f001,0011) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="Protocol" Name="Protocol"
+(f001,0012) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="CaptureInputType" Name="Capture Input Type"
+(f001,0013) VERS="SND" VR="LT" VM="1" Owner="Sound Eklin" Keyword="ExamComplaint" Name="Exam Complaint"
+(f001,0014) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ExamWebCode" Name="Exam Web Code"
+(f001,0015) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ExamCategory" Name="Exam Category"
+(f001,0016) VERS="SND" VR="SH" VM="1" Owner="Sound Eklin" Keyword="ExamDiagnosis" Name="Exam Diagnosis"
+(f001,0017) VERS="SND" VR="PN" VM="1" Owner="Sound Eklin" Keyword="ExamCreatedBy" Name="Exam Created By"
+(f001,0018) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ExamCreatedByGroup" Name="Exam Created By Group"
+(f001,0019) VERS="SND" VR="DT" VM="1" Owner="Sound Eklin" Keyword="ExamRequiredByDateTime" Name="Exam Required By DateTime"
+(f001,001a) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="CaptureType" Name="Capture Type"
+(f001,001b) VERS="SND" VR="IS" VM="1" Owner="Sound Eklin" Keyword="TelemedExamID" Name="Telemed Exam ID"
+(f001,001c) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ExamCreatedByGuid" Name="Exam Created By Guid"
+(f001,001d) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ClientNameGuid" Name="Client Name Guid"
+(f001,001e) VERS="SND" VR="LO" VM="1" Owner="Sound Eklin" Keyword="ReceptorBitsPerPixel" Name="Receptor Bits Per Pixel"
+
+(f001,0002) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="PatientCategorySize" Name="Patient Category Size"
+(f001,0003) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="PatientSexExtended" Name="Patient Sex Extended"
+(f001,0004) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ImageView" Name="Image View"
+(f001,0005) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="AnatomyImaged" Name="Anatomy Imaged"
+(f001,0006) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ImageEnhancements" Name="Image Enhancements"
+(f001,0007) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="DetectorSettings" Name="Detector Settings"
+(f001,0008) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ApplicationVersion" Name="Application Version"
+(f001,0009) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ImageLateralityExtended" Name="Image Laterality Extended"
+(f001,000a) VERS="SND" VR="PN" VM="1" Owner="Sound Technologies" Keyword="ClientName" Name="Client Name"
+(f001,000b) VERS="SND" VR="UI" VM="1" Owner="Sound Technologies" Keyword="ReferenceStudyInstanceUID" Name="Reference Study Instance UID"
+(f001,000c) VERS="SND" VR="UI" VM="1" Owner="Sound Technologies" Keyword="ReferenceSeriesInstanceUID" Name="Reference Series Instance UID"
+(f001,000d) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ExamRefId" Name="Exam Ref Id"
+(f001,000e) VERS="SND" VR="ST" VM="1" Owner="Sound Technologies" Keyword="PhysicianOfRecordAddress" Name="Physician of Record Address"
+(f001,000f) VERS="SND" VR="SH" VM="1-n" Owner="Sound Technologies" Keyword="PhysicianOfRecordPhoneNumbers" Name="Physician of Record Phone Numbers"
+(f001,0010) VERS="SND" VR="LT" VM="1" Owner="Sound Technologies" Keyword="ReasonForStudy" Name="Reason for Study"
+(f001,0011) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="Protocol" Name="Protocol"
+(f001,0012) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="CaptureInputType" Name="Capture Input Type"
+(f001,0013) VERS="SND" VR="LT" VM="1" Owner="Sound Technologies" Keyword="ExamComplaint" Name="Exam Complaint"
+(f001,0014) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ExamWebCode" Name="Exam Web Code"
+(f001,0015) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ExamCategory" Name="Exam Category"
+(f001,0016) VERS="SND" VR="SH" VM="1" Owner="Sound Technologies" Keyword="ExamDiagnosis" Name="Exam Diagnosis"
+(f001,0017) VERS="SND" VR="PN" VM="1" Owner="Sound Technologies" Keyword="ExamCreatedBy" Name="Exam Created By"
+(f001,0018) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ExamCreatedByGroup" Name="Exam Created By Group"
+(f001,0019) VERS="SND" VR="DT" VM="1" Owner="Sound Technologies" Keyword="ExamRequiredByDateTime" Name="Exam Required By DateTime"
+(f001,001a) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="CaptureType" Name="Capture Type"
+(f001,001b) VERS="SND" VR="IS" VM="1" Owner="Sound Technologies" Keyword="TelemedExamID" Name="Telemed Exam ID"
+(f001,001c) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ExamCreatedByGuid" Name="Exam Created By Guid"
+(f001,001d) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ClientNameGuid" Name="Client Name Guid"
+(f001,001e) VERS="SND" VR="LO" VM="1" Owner="Sound Technologies" Keyword="ReceptorBitsPerPixel" Name="Receptor Bits Per Pixel"
+
+(0031,0003) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0004) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0005) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0006) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0007) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0008) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0009) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,000a) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,000c) VERS="NUM" VR="UI" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,000e) VERS="NUM" VR="DT" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,000f) VERS="NUM" VR="DT" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0010) VERS="NUM" VR="FD" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0011) VERS="NUM" VR="PN" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0012) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0014) VERS="NUM" VR="FD" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0015) VERS="NUM" VR="DT" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,001a) VERS="NUM" VR="PN" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,001b) VERS="NUM" VR="FD" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,001c) VERS="NUM" VR="DT" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0021) VERS="NUM" VR="PN" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0022) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0023) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0024) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0025) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0026) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0027) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0028) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0029) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,002a) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,002b) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,002c) VERS="NUM" VR="SH" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,002d) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
+(0031,0032) VERS="NUM" VR="LO" VM="1" Owner="NUMACALC-INVENTORY" Keyword="?" Name="?"
diff --git a/libsrc/standard/iodcomp/base.tpl b/libsrc/standard/iodcomp/base.tpl
index 3711f3f..7a28df3 100755
--- a/libsrc/standard/iodcomp/base.tpl
+++ b/libsrc/standard/iodcomp/base.tpl
@@ -926,6 +926,7 @@ CompositeIOD="ParametricMap" Condition="ParametricMapInstance"
Module="MultiFrameFunctionalGroupsCommon" Usage="M"
Module="MultiFrameFunctionalGroupsForParametricMap" Usage="M"
Module="MultiFrameDimension" Usage="M"
+ Module="PaletteColorLookupTable" Usage="C" Condition="PixelPresentationIsColorRangeAndPaletteColorLookupTableUIDAbsent"
Module="CardiacSynchronization" Usage="U" Condition="NeedModuleCardiacSynchronization"
Module="RespiratorySynchronization" Usage="U" Condition="NeedModuleRespiratorySynchronization"
Module="BulkMotionSynchronization" Usage="U" Condition="NeedModuleBulkMotion"
diff --git a/libsrc/standard/module/base.tpl b/libsrc/standard/module/base.tpl
index 7a3aca8..6f0fee5 100755
--- a/libsrc/standard/module/base.tpl
+++ b/libsrc/standard/module/base.tpl
@@ -490,6 +490,13 @@ Module="Patient"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
SequenceEnd
+ Sequence="GeneticModificationsSequence" Type="3" VM="1"
+ Name="GeneticModificationsDescription" Type="1"
+ Name="GeneticModificationsNomenclature" Type="1"
+ Sequence="GeneticModificationsCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
+ SequenceEnd
Name="ResponsiblePerson" Type="2C" Condition="IsAnimal" mbpo="true"
Name="ResponsiblePersonRole" Type="1C" Condition="ResponsiblePersonIsPresentWithValue" StringDefinedTerms="ResponsiblePersonRole"
Name="ResponsibleOrganization" Type="2C" Condition="IsAnimal" mbpo="true"
@@ -1359,9 +1366,15 @@ Module="CTImage"
Name="ExposureModulationType" Type="3"
Name="EstimatedDoseSaving" Type="3"
Name="CTDIvol" Type="3" NotZeroWarning=""
+ Verify="CTDIvol" Condition="CTDIvolIsPresentButCTDIPhantomTypeCodeSequenceIsNot" ThenWarningMessage="CTDIvol is present but it is uninterpretable without CTDIPhantomTypeCodeSequence, which is absent"
Sequence="CTDIPhantomTypeCodeSequence" Type="3" VM="1"
InvokeMacro="CodeSequenceMacro" DefinedContextID="4052"
SequenceEnd
+ Name="WaterEquivalentDiameter" Type="3" NotZeroWarning=""
+ Sequence="WaterEquivalentDiameterCalculationMethodCodeSequence" Type="1C" VM="1" Condition="WaterEquivalentDiameterIsPresent"
+ InvokeMacro="CodeSequenceMacro" DefinedContextID="10024"
+ SequenceEnd
+ Name="ImageAndFluoroscopyAreaDoseProduct" Type="3" NotZeroWarning=""
InvokeMacro="GeneralAnatomyOptionalMacro"
InvokeMacro="OptionalViewAndSliceProgressionDirectionMacro"
Name="CalciumScoringMassFactorPatient" Type="3" NotZeroWarning=""
@@ -1391,7 +1404,7 @@ Module="MRImage"
Name="SequenceVariant" Type="1" StringDefinedTerms="SequenceVariant"
Name="ScanOptions" Type="2" StringDefinedTerms="ScanOptions"
Name="MRAcquisitionType" Type="2" StringEnumValues="MRAcquisitionType"
- Name="RepetitionTime" Type="2C" Condition="MRIsNotEchoPlanarNotSegmentedKSpace"
+ Name="RepetitionTime" Type="2C" Condition="MRIsNotEchoPlanarOrIsSegmentedKSpace"
Name="EchoTime" Type="2" NotZeroWarning=""
Name="EchoTrainLength" Type="2" NotZeroWarning=""
Name="InversionTime" Type="2C" Condition="MRIsInversionRecovery" NotZeroWarning=""
@@ -2755,7 +2768,7 @@ Module="MultiFrameFunctionalGroupsForParametricMap"
InvokeMacro="ContrastBolusUsageMacro" Condition="NeedContrastBolusUsageMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="ParametricMapFrameTypeMacro" Condition="ParametricMapFrameTypeSequenceNotInSharedFunctionalGroupSequence"
- InvokeMacro="StoredValueColorRangeMacro" Condition="StoredValueColorRangeSequenceeNotInSharedFunctionalGroupSequenceAndPixelPresentationIsColorRange"
+ InvokeMacro="StoredValueColorRangeMacro" Condition="StoredValueColorRangeSequenceNotInSharedFunctionalGroupSequenceAndPixelPresentationIsColorRange"
SequenceEnd
ModuleEnd
diff --git a/libsrc/standard/module/ct.tpl b/libsrc/standard/module/ct.tpl
index 107cf02..c5cdb5a 100644
--- a/libsrc/standard/module/ct.tpl
+++ b/libsrc/standard/module/ct.tpl
@@ -138,9 +138,15 @@ DefineMacro="CTExposureMacro" InformationEntity="FunctionalGroup"
Name="ExposureModulationType" Type="1C" StringDefinedTerms ="CTExposureModulationType" Condition="Always" # ORIGINAL mbpo
Name="EstimatedDoseSaving" Type="2C" Condition="ExposureModulationTypeIsNotNone" NotZeroWarning="" # ORIGINAL mbpo
Name="CTDIvol" Type="2C" NoCondition="" NotZeroWarning=""
+ Verify="CTDIvol" Condition="CTDIvolIsPresentButCTDIPhantomTypeCodeSequenceIsNot" ThenWarningMessage="CTDIvol is present but it is uninterpretable without CTDIPhantomTypeCodeSequence, which is absent"
Sequence="CTDIPhantomTypeCodeSequence" Type="3" VM="1"
InvokeMacro="CodeSequenceMacro" DefinedContextID="4052"
SequenceEnd
+ Name="WaterEquivalentDiameter" Type="3" NotZeroWarning=""
+ Sequence="WaterEquivalentDiameterCalculationMethodCodeSequence" Type="1C" VM="1" Condition="WaterEquivalentDiameterIsPresent"
+ InvokeMacro="CodeSequenceMacro" DefinedContextID="10024"
+ SequenceEnd
+ Name="ImageAndFluoroscopyAreaDoseProduct" Type="3" NotZeroWarning=""
SequenceEnd
MacroEnd
diff --git a/libsrc/standard/module/vl.tpl b/libsrc/standard/module/vl.tpl
index 5b2872b..8d208fc 100755
--- a/libsrc/standard/module/vl.tpl
+++ b/libsrc/standard/module/vl.tpl
@@ -144,7 +144,6 @@ DefineMacro="OphthalmicAcquisitionParametersMacro" InformationEntity="Image"
SequenceEnd
Name="EmmetropicMagnification" Type="2" NotZeroWarning=""
Name="IntraOcularPressure" Type="2" NotZeroWarning=""
- Name="HorizontalFieldOfView" Type="2" NotZeroWarning=""
Name="PupilDilated" Type="2" StringEnumValues="YesNoFull"
Sequence="MydriaticAgentSequence" Type="2C" VM="0-n" Condition="PupilDilatedIsYes"
Sequence="MydriaticAgentCodeSequence" Type="1" VM="1"
@@ -163,6 +162,7 @@ Module="OphthalmicPhotographyAcquisitionParameters"
Sequence="PatientEyeMovementCommandCodeSequence" Type="1C" VM="1" Condition="PatientEyeMovementCommandedIsYes"
InvokeMacro="CodeSequenceMacro" BaselineContextID="4201"
SequenceEnd
+ Name="HorizontalFieldOfView" Type="2" NotZeroWarning=""
InvokeMacro="OphthalmicAcquisitionParametersMacro"
ModuleEnd
@@ -228,8 +228,8 @@ Module="OphthalmicTomographyImage"
ModuleEnd
Module="OphthalmicTomographyAcquisitionParameters"
- Name="AxialLengthOfTheEye" Type="2"
- Name="HorizontalFieldOfView" Type="2"
+ Name="AxialLengthOfTheEye" Type="2" NotZeroWarning=""
+ Name="HorizontalFieldOfView" Type="2" NotZeroWarning=""
InvokeMacro="OphthalmicAcquisitionParametersMacro"
ModuleEnd
diff --git a/libsrc/standard/strval/base.tpl b/libsrc/standard/strval/base.tpl
index 64fc11c..911363d 100755
--- a/libsrc/standard/strval/base.tpl
+++ b/libsrc/standard/strval/base.tpl
@@ -268,6 +268,7 @@ StringValues="MiscellaneousCodingSchemeDesignators" {
99NCIAIM = NCI Annotation Imaging Markup,
99HOLXDXA = Hologic DXA,
99KINETDX = Siemens Acuson Ultrasound,
+ 99NUMA = NUMA,
ACR = ACR Index for Radiological Diagnosis,
ART = WHO Adverse Reaction terms,
AS4 = ASTM,
--
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