[med-svn] [dicom3tools] 01/06: New upstream version 1.00~20161218101718
Gert Wollny
gert-guest at moszumanska.debian.org
Tue Jan 10 14:03:27 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 563c9afef1300d0af287ee289dd39c0a0e80e103
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Mon Jan 9 08:27:14 2017 +0000
New upstream version 1.00~20161218101718
---
CHANGES | 50 ++++++++++++++++++-
VERSION | 2 +-
appsrc/dcfile/dcbzip2.man | 7 ++-
appsrc/dcfile/dcbzip2.script | 5 +-
appsrc/dcfile/dciodvfy.man | 18 +++++--
appsrc/dcfile/dcunbzip2.man | 7 ++-
appsrc/dcfile/dcunbzip2.script | 5 +-
libsrc/include/dctool/attr.h | 2 +-
libsrc/include/dctool/attrseq.h | 2 +-
libsrc/include/dctool/elmdict.h | 4 +-
libsrc/src/dctool/attrseq.cc | 8 ++--
libsrc/src/dctool/attrvrfy.cc | 8 ++--
libsrc/src/dctool/elmdict.cc | 4 +-
libsrc/src/dctool/elmentry.h | 4 +-
libsrc/src/dctool/elmtype.h | 4 +-
libsrc/src/dctool/modulev.cc | 14 +++---
libsrc/src/generic/version.cc | 2 +-
libsrc/standard/condn.tpl | 68 ++++++++++++++++++++++++++
libsrc/standard/elmdict/dicom3.tpl | 96 +++++++++++++++++++++++++++++++++++--
libsrc/standard/elmdict/gems.tpl | 68 +++++++++++++++++++++-----
libsrc/standard/elmdict/other.tpl | 27 +++++++++++
libsrc/standard/elmdict/siemens.tpl | 46 +++++++++---------
libsrc/standard/iodcomp/base.tpl | 17 +++++++
libsrc/standard/iodcomp/dx.tpl | 12 +++++
libsrc/standard/iodcomp/pet.tpl | 1 +
libsrc/standard/iodcomp/rt.tpl | 15 ++++--
libsrc/standard/iodcomp/sr.tpl | 28 +++++++++++
libsrc/standard/iodcomp/us.tpl | 2 +
libsrc/standard/iodcomp/vl.tpl | 10 ++++
libsrc/standard/iodcomp/xaxrf.tpl | 2 +
libsrc/standard/module/base.tpl | 91 ++++++++++++++++++++++++++---------
libsrc/standard/module/dx.tpl | 1 +
libsrc/standard/module/mr.tpl | 6 +++
libsrc/standard/module/rt.tpl | 6 +++
libsrc/standard/module/sr.tpl | 39 ++++++++++++++-
libsrc/standard/strval/base.tpl | 11 +++++
libsrc/standard/strval/pet.tpl | 2 +
37 files changed, 589 insertions(+), 105 deletions(-)
diff --git a/CHANGES b/CHANGES
index 75c14e6..a191665 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,51 @@
+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)
+
+161129: libsrc/standard/module,strval/base.plt: Do not report YBR_FULL as illegal for lossless JPEG (000500)
+
+161123: libsrc/standard/elmdict/dicom3.tpl: Correct VR of View Orientation Modifier, Component Type Code Sequence to SQ and name of View Orientation Modifier Code Sequence (were wrong in Sup 131)
+
+161121: libsrc/standard/elmdict/siemens.tpl: Update Siemens raw data ultrasound with observed VR
+
+161106: libsrc/standard/strval/pet.tpl: Additional SUV LBM types (CP 1535) (CP 1612)
+
+161106: libsrc/standard/elmdict/dicom3.tpl,module/base.tpl: Clarify Segmentation Algorithm Parameters (CP 1597)
+
+161106: libsrc/standard/module/base.tpl,module/mr.tpl: Add Content Labels for Raw Data (CP 1595)
+
+161105: libsrc/standard/condn.tpl,elmdict/dicom3.tpl,module/base.tpl,strval/base.tpl: Allow Palette Color in Parametric Map (CP 1584)
+
+161105: libsrc/standard/elmdict/dicom3.tpl,module/rt.tpl: Add Selected Value To RT Treatment Overrides (CP 1611)
+
+161105: libsrc/standard/elmdict/dicom3.tpl,module/rt.tpl: RT Ion Beams Scan Spot Time Indicator (CP 1609)
+
+161103: libsrc/standard/condn.tpl,module/dx.tpl: Check for ImageType values from CP 1342 for DBT profile per Rad TF Vol 2 Table 4.8.4.1.2.7-1 (000499)
+
+161017: appsrc/dcfile/dcbzip2.script,dcunbzip2.script: No longer remove BZ prefix from bzip2 compressed stream (000498)
+
+161008: libsrc/standard/elmdict/gems.tpl: Add more GE private mammo data elements
+
+160929: libsrc/standard/elmdict/dicom3.tpl: Update data dictionary for release of 2016d to include TargetPositionReferenceIndicator
+
+160920: libsrc/standard/elmdict/dicom3.tpl,module/base.tpl: Add Category And Type Codes to Fiducials and Surface Scan Mesh (CP 1585) - Point Cloud IOD not yet done
+
+160919: libsrc/standard/condn.tpl,iodcomp/base.tpl,dx.tpl,pet.tpl,rt.tpl,us.tpl,vl.tpl,xaxrf.tpl,module/base.tpl: Factor our General Reference Module from General Image Module and add to selected RT-related IODs (CP 1559); Add Purpose of Reference for Source Instance Sequence (CP 1575)
+
+160910: libsrc/standard/module/base.tpl: Include MR image and frame type value 4 defined terms for parameteric map, not just common defined terms (000497)
+
+160908: libsrc/standard/elmdict/dicom3.tpl,module/rt.tpl: Add Segmented Property Type Modifier Code Sequence to RT ROI Observations Module (CP1586)
+
+160908: libsrc/standard/condn.tpl,module/base.tpl: Correct conditions in Referenced and Derivation Image Macros when legacy converted (CP 1562)
+
+160908: libsrc/standard/elmdict/dicom3.tpl,module/base.tpl: Add UDI (CP 1418)
+
+160905: libsrc/standard/elmdict/dicom3.tpl: Add CT Protocol Storage data elements (Sup 121)
+
+160826: libsrc/standard/elmdict/gems.tpl: Add more GE private mammo data elements
+
+160819: include/dctool/attr.h,attrseq.h,elmdict.h,src/dctool/attrseq.cc,attrvrfy.cc,elmdict.cc,elmentry.h,elmtype.h,modulev.cc: Do not assume largest VM or number of sequence items fits in 16 bit unsigned; fixes check on number of per-frame functional group sequence items when number of frames more than 65535 (000496)
+
+160721: libsrc/standard/elmdict/other.tpl: Add UCSF BIRP MR breast private data elements
+
160721: libsrc/standard/condn.tpl: Add more SOP Classes in General Image Module for which absent Patient Orientation should not be reported, such as Parameteric Map (000495)
160610: libsrc/standard/strval/base.tpl: Update language code RFC (CP 1567)
@@ -14,7 +62,7 @@
160515: appsrc/dcfile/dcunjpeg.script,dcunjls.script: Improve handling when elements past pixel data, remove icon image sequence (000491) (000492)"
-160515: libsrc/standard/elmdict/gems.tpl: Add observed private Toshiba CT data element VRs
+160515: libsrc/standard/elmdict/gems.tpl: Add observed private GE CT data element VRs
160515: libsrc/standard/elmdict/toshiba.tpl: Add observed private Toshiba MR data element VRs
diff --git a/VERSION b/VERSION
index a1f2d7c..38714c6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.snapshot.20160721064406
+1.00.snapshot.20161218101718
diff --git a/appsrc/dcfile/dcbzip2.man b/appsrc/dcfile/dcbzip2.man
index 7379e0b..2b257be 100755
--- a/appsrc/dcfile/dcbzip2.man
+++ b/appsrc/dcfile/dcbzip2.man
@@ -1,4 +1,4 @@
-.TH dcbzip2 1 "23 Feb 2003" "DICOM PS3" "DICOM PS3 - Create bzip2 DICOM file"
+.TH dcbzip2 1 "17 Oct 2016" "DICOM PS3" "DICOM PS3 - Create bzip2 DICOM file"
.SH NAME
dcbzip2 \- ACR/NEMA DICOM PS3 ... DICOM PS3 - Create bzip2 DICOM file
.SH SYNOPSIS
@@ -26,5 +26,8 @@ There are no options.
.SH SEE ALSO
.BR dcunbzip2(1)
.SH AUTHOR
-Copyright (c) 1993-2015, David A. Clunie DBA PixelMed Publishing. All rights reserved.
+Copyright (c) 1993-2016, David A. Clunie DBA PixelMed Publishing. All rights reserved.
.SH BUGS
+Previously the first two "BZ" bytes were stripped before encoding;
+this is no longer performed and could result in incompatibility
+with old files saved in the bzip2 transfer syntax
diff --git a/appsrc/dcfile/dcbzip2.script b/appsrc/dcfile/dcbzip2.script
index 37ae59c..6949906 100755
--- a/appsrc/dcfile/dcbzip2.script
+++ b/appsrc/dcfile/dcbzip2.script
@@ -10,7 +10,6 @@ BZIP2=bzip2
$DCCP $1 -justmeta -ra TransferSyntaxUID "1.3.6.1.4.1.5962.300.1" >$2
$DCCP $1 -nometa -output-vr explicit -output-endian little | $BZIP2 >$TMPROOT.1.tmp
-dd if=$TMPROOT.1.tmp ibs=2 skip=1 of=$TMPROOT.2.tmp 2>/dev/null
+# no longer remove the BZ prefix (000498)
+cat $TMPROOT.1.tmp >>$2
rm $TMPROOT.1.tmp
-cat $TMPROOT.2.tmp >>$2
-rm $TMPROOT.2.tmp
diff --git a/appsrc/dcfile/dciodvfy.man b/appsrc/dcfile/dciodvfy.man
index e3d6a0a..76191a2 100755
--- a/appsrc/dcfile/dciodvfy.man
+++ b/appsrc/dcfile/dciodvfy.man
@@ -1,4 +1,4 @@
-.TH DCIODVFY 1 "6 March 2014" "DICOM PS3" "DICOM PS3 - Validate DICOM objects"
+.TH DCIODVFY 1 "6 December 2016" "DICOM PS3" "DICOM PS3 - Validate DICOM objects"
.SH NAME
dciodvfy \- ACR/NEMA DICOM PS3 ... DICOM PS3 - Validate DICOM objects
.SH SYNOPSIS
@@ -39,7 +39,19 @@ The basic input switches are described in dcintro(1). Options specific to this p
.TP
.B \-profile profilename
.RS
-Validate not against the standard but the IOD matching the named profile.
+Validate against the IOD matching the named profile. Currently supported profiles that specialize the DICOM standard IODs with additional requirements are
+.TP
+IHEREM (specializes XRayRadiationDoseSR),
+.TP
+IHEMammo (specializes MammographyImageForProcessing and MammographyImageForPresentation),
+.TP
+IHEMammoProfileWithPartialViewOption (specializes MammographyImageForPresentation),
+.TP
+IHEDBT (specializes BreastTomosynthesisImage),
+.TP
+IHEXDSIManifest (specializes KeyObjectSelectionDocument),
+.TP
+Dental (specializes IntraoralImageForPresentation, DXImageForPresentation and BasicDirectory)
.RE
.TP
.B \-describe
@@ -121,5 +133,5 @@ Error - Missing attribute Type 1 Required ...
.BR dcfile(1) ,
.BR dcintro(1)
.SH AUTHOR
-Copyright (c) 1993-2015, David A. Clunie DBA PixelMed Publishing. All rights reserved.
+Copyright (c) 1993-2016, David A. Clunie DBA PixelMed Publishing. All rights reserved.
.SH BUGS
diff --git a/appsrc/dcfile/dcunbzip2.man b/appsrc/dcfile/dcunbzip2.man
index aa78890..c3b05fc 100755
--- a/appsrc/dcfile/dcunbzip2.man
+++ b/appsrc/dcfile/dcunbzip2.man
@@ -1,4 +1,4 @@
-.TH dcunbzip2 1 "23 Feb 2003" "DICOM PS3" "DICOM PS3 - Decompress deflated DICOM file"
+.TH dcunbzip2 1 "17 Oct 2016" "DICOM PS3" "DICOM PS3 - Decompress deflated DICOM file"
.SH NAME
dcunbzip2 \- ACR/NEMA DICOM PS3 ... DICOM PS3 - Decompress deflated DICOM file
.SH SYNOPSIS
@@ -27,5 +27,8 @@ There are no options.
.SH SEE ALSO
.BR dcbzip2(1)
.SH AUTHOR
-Copyright (c) 1993-2015, David A. Clunie DBA PixelMed Publishing. All rights reserved.
+Copyright (c) 1993-2016, David A. Clunie DBA PixelMed Publishing. All rights reserved.
.SH BUGS
+Previously the first two "BZ" bytes were stripped before encoding;
+this is no longer performed and could result in incompatibility
+with old files saved in the bzip2 transfer syntax
diff --git a/appsrc/dcfile/dcunbzip2.script b/appsrc/dcfile/dcunbzip2.script
index 5368f24..1db9d96 100755
--- a/appsrc/dcfile/dcunbzip2.script
+++ b/appsrc/dcfile/dcunbzip2.script
@@ -10,9 +10,8 @@ DCRMMETA=dcrmmeta
BZIP2=bzip2
$DCRMMETA $1 $TMPROOT.0.tmp
-echo -n 'BZ' | cat - $TMPROOT.0.tmp >$TMPROOT.1.tmp
+# no longer need to add back the BZ prefix (000498)
+$BZIP2 -d < $TMPROOT.0.tmp > $TMPROOT.2.tmp
rm $TMPROOT.0.tmp
-$BZIP2 -d < $TMPROOT.1.tmp > $TMPROOT.2.tmp
-rm $TMPROOT.1.tmp
$DCCP $TMPROOT.2.tmp $2
rm $TMPROOT.2.tmp
diff --git a/libsrc/include/dctool/attr.h b/libsrc/include/dctool/attr.h
index 920aff6..aa1277e 100644
--- a/libsrc/include/dctool/attr.h
+++ b/libsrc/include/dctool/attr.h
@@ -151,7 +151,7 @@ public:
virtual bool verifyNotZero(bool verbose,TextOutputStream& log,ElementDictionary *dict,int which=-1,bool warningNotError=true) const;
virtual bool verifyVR(const char *module,const char *element,TextOutputStream& log,ElementDictionary *dict) const;
- virtual bool verifyVM(const char *module,const char *element,TextOutputStream& log,ElementDictionary *dict,Uint16 multiplicityMin=0,Uint16 multiplicityMax=0,const char *source=NULL) const;
+ virtual bool verifyVM(const char *module,const char *element,TextOutputStream& log,ElementDictionary *dict,Uint32 multiplicityMin=0,Uint32 multiplicityMax=0,const char *source=NULL) const;
};
#endif // __Header_attr__
diff --git a/libsrc/include/dctool/attrseq.h b/libsrc/include/dctool/attrseq.h
index 9e9b84b..ccebb5a 100644
--- a/libsrc/include/dctool/attrseq.h
+++ b/libsrc/include/dctool/attrseq.h
@@ -66,7 +66,7 @@ public:
void reviseVL(void) {}
- bool verifyVM(const char *module,const char *element,TextOutputStream& log,ElementDictionary *dict,Uint16 multiplicityMin=0,Uint16 multiplicityMax=0,const char *source=NULL) const;
+ bool verifyVM(const char *module,const char *element,TextOutputStream& log,ElementDictionary *dict,Uint32 multiplicityMin=0,Uint32 multiplicityMax=0,const char *source=NULL) const;
};
#endif /* __Header_attrseq__ */
diff --git a/libsrc/include/dctool/elmdict.h b/libsrc/include/dctool/elmdict.h
index e8a69a5..7b2a232 100644
--- a/libsrc/include/dctool/elmdict.h
+++ b/libsrc/include/dctool/elmdict.h
@@ -15,8 +15,8 @@ public:
~ElementDictionary();
const char * getValueRepresentation(Tag t) const;
- const Uint16 getValueMultiplicityMinimum(Tag t) const;
- const Uint16 getValueMultiplicityMaximum(Tag t) const;
+ const Uint32 getValueMultiplicityMinimum(Tag t) const;
+ const Uint32 getValueMultiplicityMaximum(Tag t) const;
const char * getDescription(Tag t) const;
const char * getKeyword(Tag t) const;
bool getTag(const char *keyword,Tag& tr) const;
diff --git a/libsrc/src/dctool/attrseq.cc b/libsrc/src/dctool/attrseq.cc
index e439f85..4859391 100644
--- a/libsrc/src/dctool/attrseq.cc
+++ b/libsrc/src/dctool/attrseq.cc
@@ -115,15 +115,15 @@ bool
SequenceAttribute::verifyVM(const char *module,const char *element,
TextOutputStream& log,
ElementDictionary *dict,
- Uint16 multiplicityMin,Uint16 multiplicityMax,const char *specifiedSource) const
+ Uint32 multiplicityMin,Uint32 multiplicityMax,const char *specifiedSource) const
{
// Sequences always have a VM of 1, by definition
// Here we are checking the number of items, not the VM per se.
- Assert(dict);
- Tag tag=getTag();
+ //Assert(dict);
+ //Tag tag=getTag();
Uint32 nItems = getNumberOfItems();
//log << "SequenceAttribute::verifyVM(): nItems = " << nItems << endl;
- Uint16 errmin,errmax;
+ Uint32 errmin,errmax;
int err=0;
const char *source;
if (multiplicityMin != 0 && multiplicityMax != 0) { // else don't check
diff --git a/libsrc/src/dctool/attrvrfy.cc b/libsrc/src/dctool/attrvrfy.cc
index 3d11b2f..2b765a0 100644
--- a/libsrc/src/dctool/attrvrfy.cc
+++ b/libsrc/src/dctool/attrvrfy.cc
@@ -412,15 +412,15 @@ bool
Attribute::verifyVM(const char *module,const char *element,
TextOutputStream& log,
ElementDictionary *dict,
- Uint16 multiplicityMin,Uint16 multiplicityMax,const char *specifiedSource) const
+ Uint32 multiplicityMin,Uint32 multiplicityMax,const char *specifiedSource) const
{
Assert(dict);
Tag tag=getTag();
Uint16 vm=getVM();
//log << "Attribute::verifyVM(): getVM() = " << vm << endl;
- Uint16 dictmin=dict->getValueMultiplicityMinimum(tag);
- Uint16 dictmax=dict->getValueMultiplicityMaximum(tag);
- Uint16 errmin,errmax;
+ Uint32 dictmin=dict->getValueMultiplicityMinimum(tag);
+ Uint32 dictmax=dict->getValueMultiplicityMaximum(tag);
+ Uint32 errmin,errmax;
int err=0;
const char *source;
Assert(VMNONE == 0);
diff --git a/libsrc/src/dctool/elmdict.cc b/libsrc/src/dctool/elmdict.cc
index fb45cb7..768347f 100644
--- a/libsrc/src/dctool/elmdict.cc
+++ b/libsrc/src/dctool/elmdict.cc
@@ -148,14 +148,14 @@ ElementDictionary::getValueRepresentation(Tag t) const
return e ? e->ValueRepresentation : 0;
}
-const Uint16
+const Uint32
ElementDictionary::getValueMultiplicityMinimum(Tag t) const
{
const ElementDictionaryTableEntry *e = (*this)[t];
return e ? e->ValueMultiplicityMinimum : VMNONE;
}
-const Uint16
+const Uint32
ElementDictionary::getValueMultiplicityMaximum(Tag t) const
{
const ElementDictionaryTableEntry *e = (*this)[t];
diff --git a/libsrc/src/dctool/elmentry.h b/libsrc/src/dctool/elmentry.h
index 94afae1..9dbcf8f 100644
--- a/libsrc/src/dctool/elmentry.h
+++ b/libsrc/src/dctool/elmentry.h
@@ -8,8 +8,8 @@ public:
Uint16 Element;
Uint16 PrivateBlock; // 0x0010-0x00ff valid, 0x0000=inactive
const char * ValueRepresentation;
- Uint16 ValueMultiplicityMinimum;
- Uint16 ValueMultiplicityMaximum;
+ Uint32 ValueMultiplicityMinimum;
+ Uint32 ValueMultiplicityMaximum;
const char * Owner;
const char * Keyword;
const char * Description;
diff --git a/libsrc/src/dctool/elmtype.h b/libsrc/src/dctool/elmtype.h
index ac6b8d1..a33ca95 100644
--- a/libsrc/src/dctool/elmtype.h
+++ b/libsrc/src/dctool/elmtype.h
@@ -4,8 +4,8 @@
#include "attrtag.h"
-const Uint16 VMUNLIMITED = (Uint16)-1;
-const Uint16 VMNONE = 0;
+const Uint32 VMUNLIMITED = (Uint32)-1;
+const Uint32 VMNONE = 0;
#define DATADICTIONARYINDEXSIZE 791
diff --git a/libsrc/src/dctool/modulev.cc b/libsrc/src/dctool/modulev.cc
index 9c0837f..d8c6dfa 100644
--- a/libsrc/src/dctool/modulev.cc
+++ b/libsrc/src/dctool/modulev.cc
@@ -62,7 +62,7 @@ verifyRequired(Attribute *attr,
const char *module,const char *element,
bool verbose,TextOutputStream& log,
ElementDictionary *dict,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
// Normalized Required Data Element
@@ -99,7 +99,7 @@ verifyType1 (Attribute *attr,
const char *module,const char *element,
bool verbose,TextOutputStream& log,
ElementDictionary *dict,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
// Type 1 - Required Data Element
@@ -141,7 +141,7 @@ verifyType1C(Attribute *attr,
AttributeList *list,
AttributeList *parentlist,
AttributeList *rootlist,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
//cerr << "verifyType1C(): " << element << endl;
// Type 1C - Conditional Data Element
@@ -197,7 +197,7 @@ verifyType2 (Attribute *attr,
const char *module,const char *element,
bool verbose,TextOutputStream& log,
ElementDictionary *dict,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
// Type 2 - Required Data Element (May be Empty)
@@ -239,7 +239,7 @@ verifyType2C(Attribute *attr,
AttributeList *list,
AttributeList *parentlist,
AttributeList *rootlist,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
// Type 2C - Conditional Data Element (May be Empty)
@@ -285,7 +285,7 @@ verifyType3 (Attribute *attr,
const char *module,const char *element,
bool verbose,TextOutputStream& log,
ElementDictionary *dict,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
// Type 3 - Optional Data Element
@@ -327,7 +327,7 @@ verifyType3C(Attribute *attr,
AttributeList *list,
AttributeList *parentlist,
AttributeList *rootlist,
- Uint16 multiplicityMin,Uint16 multiplicityMax)
+ Uint32 multiplicityMin,Uint32 multiplicityMax)
{
// Type 3C - Optional Data Element that can only be present when condition is true
diff --git a/libsrc/src/generic/version.cc b/libsrc/src/generic/version.cc
index a34f926..1331e87 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.20160721064406";
+const char* dicom3tools_version_string = "1.00.snapshot.20161218101718";
diff --git a/libsrc/standard/condn.tpl b/libsrc/standard/condn.tpl
index 08a5157..0c5f68d 100755
--- a/libsrc/standard/condn.tpl
+++ b/libsrc/standard/condn.tpl
@@ -102,6 +102,12 @@ Condition="EnhancedCTImageInstance"
Element="SOPClassUID" StringConstantFromRootAttribute="EnhancedCTImageStorageSOPClassUID"
ConditionEnd
+Condition="NotLegacyConvertedCTOrMROrPET"
+ Element="SOPClassUID" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedCTImageStorageSOPClassUID"
+ Element="SOPClassUID" Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedMRImageStorageSOPClassUID"
+ Element="SOPClassUID" Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedPETImageStorageSOPClassUID"
+ConditionEnd
+
Condition="LegacyConvertedEnhancedCTImageInstance"
Element="SOPClassUID" StringConstantFromRootAttribute="LegacyConvertedEnhancedCTImageStorageSOPClassUID"
ConditionEnd
@@ -597,6 +603,15 @@ Condition="NeedModuleMultiFrameOverlay"
Element="NumberOfFramesInOverlay" ElementPresent=""
ConditionEnd
+Condition="NeedModuleGeneralReference"
+ Element="ReferencedImageSequence" ElementPresent=""
+ Element="ReferencedInstanceSequence" ElementPresent=""
+ Element="DerivationDescription" ElementPresent=""
+ Element="DerivationCodeSequence" ElementPresent=""
+ Element="SourceImageSequence" ElementPresent=""
+ Element="SourceInstanceSequence" ElementPresent=""
+ConditionEnd
+
Condition="NeedModuleUSRegionCalibration"
Element="SequenceOfUltrasoundRegions" ElementPresent=""
ConditionEnd
@@ -6645,3 +6660,56 @@ Condition="TrackingUIDIsPresent"
Element="TrackingUID" ElementPresent=""
ConditionEnd
+Condition="ImageTypeValuesNotDBTThinThickGenerated2D"
+ (
+ Element="NumberOfFrames" BinaryValue="> 1"
+ Element="ImageType" Operator="And" ValueSelector="2" StringValue="TOMOSYNTHESIS"
+ (
+ Element="ImageType" ValueSelector="3" StringValue="NONE"
+ (
+ Element="ImageType" ValueSelector="0" StringValue="DERIVED"
+ (
+ Element="ImageType" ValueSelector="3" StringValue="MAXIMUM"
+ Element="ImageType" Operator="Or" ValueSelector="3" StringValue="MEAN"
+ Element="ImageType" Operator="Or" ValueSelector="3" StringValue="SUBTRACTION"
+ Element="ImageType" Operator="Or" ValueSelector="3" StringValue="ADDITION"
+ ) Operator="And"
+ ) Operator="Or"
+ ) Operator="And"
+ ) Modifier="Not"
+ (
+ Element="NumberOfFrames" BinaryValue="== 1"
+ Element="ImageType" ValueSelector="0" StringValue="DERIVED"
+ Element="ImageType" Operator="And" ValueSelector="2" StringValue="TOMOSYNTHESIS"
+ Element="ImageType" Operator="And" ValueSelector="3" StringValue="GENERATED_2D"
+ ) Operator="And" Modifier="Not"
+ConditionEnd
+
+Condition="PixelPresentationIsColorRange"
+ Element="PixelPresentation" StringValue="COLOR_RANGE"
+ConditionEnd
+
+Condition="PixelPresentationIsColorRangeAndPaletteColorLookupTableModuleAbsent"
+ Element="PixelPresentation" StringValue="COLOR_RANGE"
+ (
+ Element="RedPaletteColorLookupTableData" ElementPresent=""
+ Element="GreenPaletteColorLookupTableData" Operator="Or" ElementPresent=""
+ Element="BluePaletteColorLookupTableData" Operator="Or" ElementPresent=""
+ Element="SegmentedRedPaletteColorLookupTableData" Operator="Or" ElementPresent=""
+ Element="SegmentedGreenPaletteColorLookupTableData" Operator="Or" ElementPresent=""
+ Element="SegmentedBluePaletteColorLookupTableData" Operator="Or" ElementPresent=""
+ Element="RedPaletteColorLookupTableDescriptor" Operator="Or" ElementPresent=""
+ Element="GreenPaletteColorLookupTableDescriptor" Operator="Or" ElementPresent=""
+ Element="BluePaletteColorLookupTableDescriptor" Operator="Or" ElementPresent=""
+ ) Operator="And" Modifier="Not"
+ConditionEnd
+
+Condition="StoredValueColorRangeSequenceNotInPerFrameFunctionalGroupSequenceAndPixelPresentationIsColorRange"
+ Element="StoredValueColorRangeSequence" Modifier="Not" ElementPresentInPathFromRoot="PerFrameFunctionalGroupsSequence"
+ Element="PixelPresentation" Operator="And" StringValueFromRootAttribute="COLOR_RANGE"
+ConditionEnd
+
+Condition="StoredValueColorRangeSequenceeNotInSharedFunctionalGroupSequenceAndPixelPresentationIsColorRange"
+ Element="StoredValueColorRangeSequence" Modifier="Not" ElementPresentInPathFromRoot="SharedFunctionalGroupsSequence"
+ Element="PixelPresentation" Operator="And" StringValueFromRootAttribute="COLOR_RANGE"
+ConditionEnd
diff --git a/libsrc/standard/elmdict/dicom3.tpl b/libsrc/standard/elmdict/dicom3.tpl
index c8ba9fa..44c8da7 100644
--- a/libsrc/standard/elmdict/dicom3.tpl
+++ b/libsrc/standard/elmdict/dicom3.tpl
@@ -1,6 +1,7 @@
# ^([(][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F],[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][)])[ \t]+(.*)[ \t]+([A-Za-z]+)[ \t]+([A-Z][A-Z])[ \t]+([0-9n-]+)[ \t]*$
# \1 VERS="3" VR="\4" VM="\5" Keyword="\3" Name="\2"
# $1 VERS="3" VR="$4" VM="$5" Keyword="$3" Name="$2"
+
(0000,0000) VERS="3" VR="UL" VM="1" Keyword="CommandGroupLength" Name="Command Group Length"
(0000,0001) VERS="RET" VR="UL" VM="1" Keyword="CommandLengthToEnd" Name="Command Length to End"
(0000,0002) VERS="3" VR="UI" VM="1" Keyword="AffectedSOPClassUID" Name="Affected SOP Class UID"
@@ -155,6 +156,9 @@
(0008,0123) VERS="3" VR="SQ" VM="1" Keyword="ContextGroupIdentificationSequence" Name="Context Group Identification Sequence"
(0008,0124) VERS="3" VR="SQ" VM="1" Keyword="MappingResourceIdentificationSequence" Name="Mapping Resource Identification Sequence"
(0008,0201) VERS="3" VR="SH" VM="1" Keyword="TimezoneOffsetFromUTC" Name="Timezone Offset From UTC"
+(0008,0220) VERS="3" VR="SQ" VM="1" Keyword="ResponsibleGroupCodeSequence" Name="Responsible Group Code Sequence"
+(0008,0221) VERS="3" VR="CS" VM="1" Keyword="EquipmentModality" Name="Equipment Modality"
+(0008,0222) VERS="3" VR="LO" VM="1" Keyword="ManufacturerRelatedModelGroup" Name="Manufacturer's Related Model Group"
(0008,0300) VERS="3" VR="SQ" VM="1" Keyword="PrivateDataElementCharacteristicsSequence" Name="Private Data Element Characteristics Sequence"
(0008,0301) VERS="3" VR="US" VM="1" Keyword="PrivateGroupReference" Name="Private Group Reference"
(0008,0302) VERS="3" VR="LO" VM="1" Keyword="PrivateCreatorReference" Name="Private Creator Reference"
@@ -163,6 +167,15 @@
(0008,0305) VERS="3" VR="SQ" VM="1" Keyword="DeidentificationActionSequence" Name="Deidentification Action Sequence"
(0008,0306) VERS="3" VR="US" VM="1-n" Keyword="IdentifyingPrivateElements" Name="Identifying Private Elements"
(0008,0307) VERS="3" VR="CS" VM="1" Keyword="DeidentificationAction" Name="Deidentification Action"
+(0008,0308) VERS="3" VR="US" VM="1" Keyword="PrivateDataElement" Name="Private Data Element"
+(0008,0309) VERS="3" VR="UL" VM="1-3" Keyword="PrivateDataElementValueMultiplicity" Name="Private Data Element Value Multiplicity"
+(0008,030A) VERS="3" VR="CS" VM="1" Keyword="PrivateDataElementValueRepresentation" Name="Private Data Element Value Representation"
+(0008,030B) VERS="3" VR="UL" VM="1-2" Keyword="PrivateDataElementNumberOfItems" Name="Private Data Element Number of Items"
+(0008,030C) VERS="3" VR="UC" VM="1" Keyword="PrivateDataElementName" Name="Private Data Element Name"
+(0008,030D) VERS="3" VR="UC" VM="1" Keyword="PrivateDataElementKeyword" Name="Private Data Element Keyword"
+(0008,030E) VERS="3" VR="UT" VM="1" Keyword="PrivateDataElementDescription" Name="Private Data Element Description"
+(0008,030F) VERS="3" VR="UT" VM="1" Keyword="PrivateDataElementEncoding" Name="Private Data Element Encoding"
+(0008,0310) VERS="3" VR="SQ" VM="1" Keyword="PrivateDataElementDefinitionSequence" Name="Private Data Element Definition Sequence"
(0008,1000) VERS="RET" VR="AE" VM="1" Keyword="NetworkID" Name="Network ID"
(0008,1010) VERS="3" VR="SH" VM="1" Keyword="StationName" Name="Station Name"
(0008,1030) VERS="3" VR="LO" VM="1" Keyword="StudyDescription" Name="Study Description"
@@ -304,6 +317,9 @@
(0010,1010) VERS="3" VR="AS" VM="1" Keyword="PatientAge" Name="Patient's Age"
(0010,1020) VERS="3" VR="DS" VM="1" Keyword="PatientSize" Name="Patient's Size"
(0010,1021) VERS="3" VR="SQ" VM="1" Keyword="PatientSizeCodeSequence" Name="Patient's Size Code Sequence"
+(0010,1022) VERS="3" VR="DS" VM="1" Keyword="PatientBodyMassIndex" Name="Patient's Body Mass Index"
+(0010,1023) VERS="3" VR="DS" VM="1" Keyword="MeasuredAPDimension" Name="Measured AP Dimension"
+(0010,1024) VERS="3" VR="DS" VM="1" Keyword="MeasuredLateralDimension" Name="Measured Lateral Dimension"
(0010,1030) VERS="3" VR="DS" VM="1" Keyword="PatientWeight" Name="Patient's Weight"
(0010,1040) VERS="3" VR="LO" VM="1" Keyword="PatientAddress" Name="Patient's Address"
(0010,1050) VERS="RET" VR="LO" VM="1-n" Keyword="InsurancePlanIdentification" Name="Insurance Plan Identification"
@@ -359,6 +375,8 @@
(0012,0083) VERS="3" VR="SQ" VM="1" Keyword="ConsentForClinicalTrialUseSequence" Name="Consent for Clinical Trial Use Sequence"
(0012,0084) VERS="3" VR="CS" VM="1" Keyword="DistributionType" Name="Distribution Type"
(0012,0085) VERS="3" VR="CS" VM="1" Keyword="ConsentForDistributionFlag" Name="Consent for Distribution Flag"
+(0012,0086) VERS="3" VR="DA" VM="1" Keyword="EthicsCommitteeApprovalEffectivenessStartDate" Name="Ethics Committee Approval Effectiveness Start Date"
+(0012,0087) VERS="3" VR="DA" VM="1" Keyword="EthicsCommitteeApprovalEffectivenessEndDate" Name="Ethics Committee Approval Effectiveness End Date"
(0018,0010) VERS="3" VR="LO" VM="1" Keyword="ContrastBolusAgent" Name="Contrast/Bolus Agent"
(0018,0012) VERS="3" VR="SQ" VM="1" Keyword="ContrastBolusAgentSequence" Name="Contrast/Bolus Agent Sequence"
(0018,0013) VERS="3" VR="FL" VM="1" Keyword="ContrastBolusT1Relaxivity" Name="Contrast/Bolus T1 Relaxivity"
@@ -419,6 +437,8 @@
(0018,1006) VERS="3" VR="LO" VM="1" Keyword="GridID" Name="Grid ID"
(0018,1007) VERS="3" VR="LO" VM="1" Keyword="CassetteID" Name="Cassette ID"
(0018,1008) VERS="3" VR="LO" VM="1" Keyword="GantryID" Name="Gantry ID"
+(0018,1009) VERS="3" VR="UT" VM="1" Keyword="UniqueDeviceIdentifier" Name="Unique Device Identifier"
+(0018,100A) VERS="3" VR="SQ" VM="1" Keyword="UDISequence" Name="UDI Sequence"
(0018,1010) VERS="3" VR="LO" VM="1" Keyword="SecondaryCaptureDeviceID" Name="Secondary Capture Device ID"
(0018,1011) VERS="RET" VR="LO" VM="1" Keyword="HardcopyCreationDeviceID" Name="Hardcopy Creation Device ID"
(0018,1012) VERS="3" VR="DA" VM="1" Keyword="DateOfSecondaryCapture" Name="Date of Secondary Capture"
@@ -912,7 +932,7 @@
(0018,9320) VERS="3" VR="SH" VM="1" Keyword="ImageFilter" Name="Image Filter"
(0018,9321) VERS="3" VR="SQ" VM="1" Keyword="CTExposureSequence" Name="CT Exposure Sequence"
(0018,9322) VERS="3" VR="FD" VM="2" Keyword="ReconstructionPixelSpacing" Name="Reconstruction Pixel Spacing"
-(0018,9323) VERS="3" VR="CS" VM="1" Keyword="ExposureModulationType" Name="Exposure Modulation Type"
+(0018,9323) VERS="3" VR="CS" VM="1-n" Keyword="ExposureModulationType" Name="Exposure Modulation Type"
(0018,9324) VERS="3" VR="FD" VM="1" Keyword="EstimatedDoseSaving" Name="Estimated Dose Saving"
(0018,9325) VERS="3" VR="SQ" VM="1" Keyword="CTXRayDetailsSequence" Name="CT X-Ray Details Sequence"
(0018,9326) VERS="3" VR="SQ" VM="1" Keyword="CTPositionSequence" Name="CT Position Sequence"
@@ -1098,6 +1118,65 @@
(0018,980E) VERS="3" VR="SQ" VM="1" Keyword="TransducerBeamSteeringCodeSequence" Name="Transducer Beam Steering Code Sequence"
(0018,980F) VERS="3" VR="SQ" VM="1" Keyword="TransducerApplicationCodeSequence" Name="Transducer Application Code Sequence"
(0018,9810) VERS="3" VR="XS" VM="1" Keyword="ZeroVelocityPixelValue" Name="Zero Velocity Pixel Value"
+(0018,9900) VERS="3" VR="LO" VM="1" Keyword="ReferenceLocationLabel" Name="Reference Location Label"
+(0018,9901) VERS="3" VR="UT" VM="1" Keyword="ReferenceLocationDescription" Name="Reference Location Description"
+(0018,9902) VERS="3" VR="SQ" VM="1" Keyword="ReferenceBasisCodeSequence" Name="Reference Basis Code Sequence"
+(0018,9903) VERS="3" VR="SQ" VM="1" Keyword="ReferenceGeometryCodeSequence" Name="Reference Geometry Code Sequence"
+(0018,9904) VERS="3" VR="DS" VM="1" Keyword="OffsetDistance" Name="Offset Distance"
+(0018,9905) VERS="3" VR="CS" VM="1" Keyword="OffsetDirection" Name="Offset Direction"
+(0018,9906) VERS="3" VR="SQ" VM="1" Keyword="PotentialScheduledProtocolCodeSequence" Name="Potential Scheduled Protocol Code Sequence"
+(0018,9907) VERS="3" VR="SQ" VM="1" Keyword="PotentialRequestedProcedureCodeSequence" Name="Potential Requested Procedure Code Sequence"
+(0018,9908) VERS="3" VR="UC" VM="1-n" Keyword="PotentialReasonsForProcedure" Name="Potential Reasons for Procedure"
+(0018,9909) VERS="3" VR="SQ" VM="1" Keyword="PotentialReasonsForProcedureCodeSequence" Name="Potential Reasons for Procedure Code Sequence"
+(0018,990A) VERS="3" VR="UC" VM="1-n" Keyword="PotentialDiagnosticTasks" Name="Potential Diagnostic Tasks"
+(0018,990B) VERS="3" VR="SQ" VM="1" Keyword="ContraindicationsCodeSequence" Name="Contraindications Code Sequence"
+(0018,990C) VERS="3" VR="SQ" VM="1" Keyword="ReferencedDefinedProtocolSequence" Name="Referenced Defined Protocol Sequence"
+(0018,990D) VERS="3" VR="SQ" VM="1" Keyword="ReferencedPerformedProtocolSequence" Name="Referenced Performed Protocol Sequence"
+(0018,990E) VERS="3" VR="SQ" VM="1" Keyword="PredecessorProtocolSequence" Name="Predecessor Protocol Sequence"
+(0018,990F) VERS="3" VR="UT" VM="1" Keyword="ProtocolPlanningInformation" Name="Protocol Planning Information"
+(0018,9910) VERS="3" VR="UT" VM="1" Keyword="ProtocolDesignRationale" Name="Protocol Design Rationale"
+(0018,9911) VERS="3" VR="SQ" VM="1" Keyword="PatientSpecificationSequence" Name="Patient Specification Sequence"
+(0018,9912) VERS="3" VR="SQ" VM="1" Keyword="ModelSpecificationSequence" Name="Model Specification Sequence"
+(0018,9913) VERS="3" VR="SQ" VM="1" Keyword="ParametersSpecificationSequence" Name="Parameters Specification Sequence"
+(0018,9914) VERS="3" VR="SQ" VM="1" Keyword="InstructionSequence" Name="Instruction Sequence"
+(0018,9915) VERS="3" VR="US" VM="1" Keyword="InstructionIndex" Name="Instruction Index"
+(0018,9916) VERS="3" VR="LO" VM="1" Keyword="InstructionText" Name="Instruction Text"
+(0018,9917) VERS="3" VR="UT" VM="1" Keyword="InstructionDescription" Name="Instruction Description"
+(0018,9918) VERS="3" VR="CS" VM="1" Keyword="InstructionPerformedFlag" Name="Instruction Performed Flag"
+(0018,9919) VERS="3" VR="DT" VM="1" Keyword="InstructionPerformedDateTime" Name="Instruction Performed DateTime"
+(0018,991A) VERS="3" VR="UT" VM="1" Keyword="InstructionPerformanceComment" Name="Instruction Performance Comment"
+(0018,991B) VERS="3" VR="SQ" VM="1" Keyword="PatientPositioningInstructionSequence" Name="Patient Positioning Instruction Sequence"
+(0018,991C) VERS="3" VR="SQ" VM="1" Keyword="PositioningMethodCodeSequence" Name="Positioning Method Code Sequence"
+(0018,991D) VERS="3" VR="SQ" VM="1" Keyword="PositioningLandmarkSequence" Name="Positioning Landmark Sequence"
+(0018,991E) VERS="3" VR="UI" VM="1" Keyword="TargetFrameOfReferenceUID" Name="Target Frame of Reference UID"
+(0018,991F) VERS="3" VR="SQ" VM="1" Keyword="AcquisitionProtocolElementSpecificationSequence" Name="Acquisition Protocol Element Specification Sequence"
+(0018,9920) VERS="3" VR="SQ" VM="1" Keyword="AcquisitionProtocolElementSequence" Name="Acquisition Protocol Element Sequence"
+(0018,9921) VERS="3" VR="US" VM="1" Keyword="ProtocolElementNumber" Name="Protocol Element Number"
+(0018,9922) VERS="3" VR="LO" VM="1" Keyword="ProtocolElementName" Name="Protocol Element Name"
+(0018,9923) VERS="3" VR="UT" VM="1" Keyword="ProtocolElementCharacteristicsSummary" Name="Protocol Element Characteristics Summary"
+(0018,9924) VERS="3" VR="UT" VM="1" Keyword="ProtocolElementPurpose" Name="Protocol Element Purpose"
+(0018,9930) VERS="3" VR="CS" VM="1" Keyword="AcquisitionMotion" Name="Acquisition Motion"
+(0018,9931) VERS="3" VR="SQ" VM="1" Keyword="AcquisitionStartLocationSequence" Name="Acquisition Start Location Sequence"
+(0018,9932) VERS="3" VR="SQ" VM="1" Keyword="AcquisitionEndLocationSequence" Name="Acquisition End Location Sequence"
+(0018,9933) VERS="3" VR="SQ" VM="1" Keyword="ReconstructionProtocolElementSpecificationSequence" Name="Reconstruction Protocol Element Specification Sequence"
+(0018,9934) VERS="3" VR="SQ" VM="1" Keyword="ReconstructionProtocolElementSequence" Name="Reconstruction Protocol Element Sequence"
+(0018,9935) VERS="3" VR="SQ" VM="1" Keyword="StorageProtocolElementSpecificationSequence" Name="Storage Protocol Element Specification Sequence"
+(0018,9936) VERS="3" VR="SQ" VM="1" Keyword="StorageProtocolElementSequence" Name="Storage Protocol Element Sequence"
+(0018,9937) VERS="3" VR="LO" VM="1" Keyword="RequestedSeriesDescription" Name="Requested Series Description"
+(0018,9938) VERS="3" VR="US" VM="1-n" Keyword="SourceAcquisitionProtocolElementNumber" Name="Source Acquisition Protocol Element Number"
+(0018,9939) VERS="3" VR="US" VM="1-n" Keyword="SourceAcquisitionBeamNumber" Name="Source Acquisition Beam Number"
+(0018,993A) VERS="3" VR="US" VM="1-n" Keyword="SourceReconstructionProtocolElementNumber" Name="Source Reconstruction Protocol Element Number"
+(0018,993B) VERS="3" VR="SQ" VM="1" Keyword="ReconstructionStartLocationSequence" Name="Reconstruction Start Location Sequence"
+(0018,993C) VERS="3" VR="SQ" VM="1" Keyword="ReconstructionEndLocationSequence" Name="Reconstruction End Location Sequence"
+(0018,993D) VERS="3" VR="SQ" VM="1" Keyword="ReconstructionAlgorithmSequence" Name="Reconstruction Algorithm Sequence"
+(0018,993E) VERS="3" VR="SQ" VM="1" Keyword="ReconstructionTargetCenterLocationSequence" Name="Reconstruction Target Center Location Sequence"
+(0018,9941) VERS="3" VR="UT" VM="1" Keyword="ImageFilterDescription" Name="Image Filter Description"
+(0018,9942) VERS="3" VR="FD" VM="1" Keyword="CTDIvolNotificationTrigger" Name="CTDIvol Notification Trigger"
+(0018,9943) VERS="3" VR="FD" VM="1" Keyword="DLPNotificationTrigger" Name="DLP Notification Trigger"
+(0018,9944) VERS="3" VR="CS" VM="1" Keyword="AutoKVPSelectionType" Name="Auto KVP Selection Type"
+(0018,9945) VERS="3" VR="FD" VM="1" Keyword="AutoKVPUpperBound" Name="Auto KVP Upper Bound"
+(0018,9946) VERS="3" VR="FD" VM="1" Keyword="AutoKVPLowerBound" Name="Auto KVP Lower Bound"
+(0018,9947) VERS="3" VR="CS" VM="1" Keyword="ProtocolDefinedPatientPosition" Name="Protocol Defined Patient Position"
(0018,A001) VERS="3" VR="SQ" VM="1" Keyword="ContributingEquipmentSequence" Name="Contributing Equipment Sequence"
(0018,A002) VERS="3" VR="DT" VM="1" Keyword="ContributionDateTime" Name="Contribution DateTime"
(0018,A003) VERS="3" VR="ST" VM="1" Keyword="ContributionDescription" Name="Contribution Description"
@@ -1140,6 +1219,7 @@
(0020,1004) VERS="RET" VR="IS" VM="1" Keyword="AcquisitionsInStudy" Name="Acquisitions in Study"
(0020,1005) VERS="RET" VR="IS" VM="1" Keyword="ImagesInStudy" Name="Images in Study"
(0020,1020) VERS="RET" VR="LO" VM="1-n" Keyword="Reference" Name="Reference"
+(0020,103F) VERS="3" VR="LO" VM="1" Keyword="TargetPositionReferenceIndicator" Name="Target Position Reference Indicator"
(0020,1040) VERS="3" VR="LO" VM="1" Keyword="PositionReferenceIndicator" Name="Position Reference Indicator"
(0020,1041) VERS="3" VR="DS" VM="1" Keyword="SliceLocation" Name="Slice Location"
(0020,1070) VERS="RET" VR="IS" VM="1-n" Keyword="OtherStudyNumbers" Name="Other Study Numbers"
@@ -1587,6 +1667,9 @@
(0028,1222) VERS="3" VR="OW" VM="1" Keyword="SegmentedGreenPaletteColorLookupTableData" Name="Segmented Green Palette Color Lookup Table Data"
(0028,1223) VERS="3" VR="OW" VM="1" Keyword="SegmentedBluePaletteColorLookupTableData" Name="Segmented Blue Palette Color Lookup Table Data"
(0028,1224) VERS="3" VR="OW" VM="1" Keyword="SegmentedAlphaPaletteColorLookupTableData" Name="Segmented Alpha Palette Color Lookup Table Data"
+(0028,1230) VERS="3" VR="SQ" VM="1" Keyword="StoredValueColorRangeSequence" Name="Stored Value Color Range Sequence"
+(0028,1231) VERS="3" VR="FD" VM="1" Keyword="MinimumStoredValueMapped" Name="Minimum Stored Value Mappe"
+(0028,1232) VERS="3" VR="FD" VM="1" Keyword="MaximumStoredValueMapped" Name="Maximum Stored Value Mapped"
(0028,1300) VERS="3" VR="CS" VM="1" Keyword="BreastImplantPresent" Name="Breast Implant Present"
(0028,1350) VERS="3" VR="CS" VM="1" Keyword="PartialView" Name="Partial View"
(0028,1351) VERS="3" VR="ST" VM="1" Keyword="PartialViewDescription" Name="Partial View Description"
@@ -2386,6 +2469,7 @@
(0062,0004) VERS="3" VR="US" VM="1" Keyword="SegmentNumber" Name="Segment Number"
(0062,0005) VERS="3" VR="LO" VM="1" Keyword="SegmentLabel" Name="Segment Label"
(0062,0006) VERS="3" VR="ST" VM="1" Keyword="SegmentDescription" Name="Segment Description"
+(0062,0007) VERS="3" VR="SQ" VM="1" Keyword="SegmentationAlgorithmIdentificationSequence" Name="Segmentation Algorithm Identification Sequence"
(0062,0008) VERS="3" VR="CS" VM="1" Keyword="SegmentAlgorithmType" Name="Segment Algorithm Type"
(0062,0009) VERS="3" VR="LO" VM="1" Keyword="SegmentAlgorithmName" Name="Segment Algorithm Name"
(0062,000A) VERS="3" VR="SQ" VM="1" Keyword="SegmentIdentificationSequence" Name="Segment Identification Sequence"
@@ -2491,7 +2575,7 @@
(0068,62D0) VERS="3" VR="US" VM="1" Keyword="HPGLDocumentID" Name="HPGL Document ID"
(0068,62D5) VERS="3" VR="LO" VM="1" Keyword="HPGLDocumentLabel" Name="HPGL Document Label"
(0068,62E0) VERS="3" VR="SQ" VM="1" Keyword="ViewOrientationCodeSequence" Name="View Orientation Code Sequence"
-(0068,62F0) VERS="3" VR="FD" VM="9" Keyword="ViewOrientationModifier" Name="View Orientation Modifier"
+(0068,62F0) VERS="3" VR="SQ" VM="1" Keyword="ViewOrientationModifierCodeSequence" Name="View Orientation Modifier Code Sequence"
(0068,62F2) VERS="3" VR="FD" VM="1" Keyword="HPGLDocumentScaling" Name="HPGL Document Scaling"
(0068,6300) VERS="3" VR="OB" VM="1" Keyword="HPGLDocument" Name="HPGL Document"
(0068,6310) VERS="3" VR="US" VM="1" Keyword="HPGLContourPenNumber" Name="HPGL Contour Pen Number"
@@ -2645,6 +2729,7 @@
(0070,031A) VERS="3" VR="UI" VM="1" Keyword="FiducialUID" Name="Fiducial UID"
(0070,031C) VERS="3" VR="SQ" VM="1" Keyword="FiducialSetSequence" Name="Fiducial Set Sequence"
(0070,031E) VERS="3" VR="SQ" VM="1" Keyword="FiducialSequence" Name="Fiducial Sequence"
+(0070,031F) VERS="3" VR="SQ" VM="1" Keyword="FiducialsPropertyCategoryCodeSequence" Name="Fiducials Property Category Code Sequence"
(0070,0401) VERS="3" VR="US" VM="3" Keyword="GraphicLayerRecommendedDisplayCIELabValue" Name="Graphic Layer Recommended Display CIELab Value"
(0070,0402) VERS="3" VR="SQ" VM="1" Keyword="BlendingSequence" Name="Blending Sequence"
(0070,0403) VERS="3" VR="FL" VM="1" Keyword="RelativeOpacity" Name="Relative Opacity"
@@ -2901,7 +2986,7 @@
(0076,0020) VERS="3" VR="SQ" VM="1" Keyword="ProcedureTypeCodeSequence" Name="Procedure Type Code Sequence"
(0076,0030) VERS="3" VR="LO" VM="1" Keyword="SurgicalTechnique" Name="Surgical Technique "
(0076,0032) VERS="3" VR="SQ" VM="1" Keyword="ComponentTypesSequence" Name="Component Types Sequence"
-(0076,0034) VERS="3" VR="CS" VM="1" Keyword="ComponentTypeCodeSequence" Name="Component Type Code Sequence"
+(0076,0034) VERS="3" VR="SQ" VM="1" Keyword="ComponentTypeCodeSequence" Name="Component Type Code Sequence"
(0076,0036) VERS="3" VR="CS" VM="1" Keyword="ExclusiveComponentType" Name="Exclusive Component Type"
(0076,0038) VERS="3" VR="CS" VM="1" Keyword="MandatoryComponentType" Name="Mandatory Component Type"
(0076,0040) VERS="3" VR="SQ" VM="1" Keyword="ComponentSequence" Name="Component Sequence"
@@ -2967,6 +3052,7 @@
(0082,0035) VERS="3" VR="SQ" VM="1" Keyword="RecommendedDefaultValueSequence" Name="Recommended Default Value Sequence"
(0082,0036) VERS="3" VR="CS" VM="1" Keyword="ConstraintViolationSignificance" Name="Constraint Violation Significance "
(0082,0037) VERS="3" VR="UT" VM="1" Keyword="ConstraintViolationCondition" Name="Constraint Violation Condition"
+(0082,0038) VERS="3" VR="CS" VM="1" Keyword="ModifiableConstraintFlag" Name="Modifiable Constraint Flag"
(0088,0130) VERS="3" VR="SH" VM="1" Keyword="StorageMediaFileSetID" Name="Storage Media File-set ID"
(0088,0140) VERS="3" VR="UI" VM="1" Keyword="StorageMediaFileSetUID" Name="Storage Media File-set UID"
(0088,0200) VERS="3" VR="SQ" VM="1" Keyword="IconImageSequence" Name="Icon Image Sequence"
@@ -3220,7 +3306,7 @@
(3006,00B6) VERS="3" VR="SQ" VM="1" Keyword="ROIElementalCompositionSequence" Name="ROI Elemental Composition Sequence"
(3006,00B7) VERS="3" VR="US" VM="1" Keyword="ROIElementalCompositionAtomicNumber" Name="ROI Elemental Composition Atomic Number"
(3006,00B8) VERS="3" VR="FL" VM="1" Keyword="ROIElementalCompositionAtomicMassFraction" Name="ROI Elemental Composition Atomic Mass Fraction"
-(3006,00B9) VERS="3" VR="SQ" VM="1" Keyword="AdditionalRTROIClassificationCodeSequence" Name="Additional RT ROI Classification Code Sequence"
+(3006,00B9) VERS="RET" VR="SQ" VM="1" Keyword="AdditionalRTROIClassificationCodeSequence" Name="Additional RT ROI Classification Code Sequence"
(3006,00C0) VERS="RET" VR="SQ" VM="1" Keyword="FrameOfReferenceRelationshipSequence" Name="Frame of Reference Relationship Sequence"
(3006,00C2) VERS="RET" VR="UI" VM="1" Keyword="RelatedFrameOfReferenceUID" Name="Related Frame of Reference UID"
(3006,00C4) VERS="RET" VR="CS" VM="1" Keyword="FrameOfReferenceTransformationType" Name="Frame of Reference Transformation Type"
@@ -3265,6 +3351,7 @@
(3008,0064) VERS="3" VR="IS" VM="1" Keyword="MeasuredDoseReferenceNumber" Name="Measured Dose Reference Number"
(3008,0065) VERS="3" VR="AT" VM="1" Keyword="ParameterPointer" Name="Parameter Pointer"
(3008,0066) VERS="3" VR="ST" VM="1" Keyword="OverrideReason" Name="Override Reason"
+(3008,0067) VERS="3" VR="US" VM="1" Keyword="ParameterValueNumber" Name="Parameter Value Number"
(3008,0068) VERS="3" VR="SQ" VM="1" Keyword="CorrectedParameterSequence" Name="Corrected Parameter Sequence"
(3008,006A) VERS="3" VR="FL" VM="1" Keyword="CorrectionValue" Name="Correction Value"
(3008,0070) VERS="3" VR="SQ" VM="1" Keyword="CalculatedDoseReferenceSequence" Name="Calculated Dose Reference Sequence"
@@ -3654,6 +3741,7 @@
(300A,0386) VERS="3" VR="FL" VM="1" Keyword="RangeModulatorGatingStartWaterEquivalentThickness" Name="Range Modulator Gating Start Water Equivalent Thickness"
(300A,0388) VERS="3" VR="FL" VM="1" Keyword="RangeModulatorGatingStopWaterEquivalentThickness" Name="Range Modulator Gating Stop Water Equivalent Thickness"
(300A,038A) VERS="3" VR="FL" VM="1" Keyword="IsocenterToRangeModulatorDistance" Name="Isocenter to Range Modulator Distance"
+(300A,038F) VERS="3" VR="FL" VM="1-n" Keyword="ScanSpotTimeOffset" Name="Scan Spot Time Offset"
(300A,0390) VERS="3" VR="SH" VM="1" Keyword="ScanSpotTuneID" Name="Scan Spot Tune ID"
(300A,0391) VERS="3" VR="IS" VM="1-n" Keyword="ScanSpotPrescribedIndices" Name="Scan Spot Prescribed Indices"
(300A,0392) VERS="3" VR="IS" VM="1" Keyword="NumberOfScanSpotPositions" Name="Number of Scan Spot Positions"
diff --git a/libsrc/standard/elmdict/gems.tpl b/libsrc/standard/elmdict/gems.tpl
index 2e74c8e..d9572ab 100755
--- a/libsrc/standard/elmdict/gems.tpl
+++ b/libsrc/standard/elmdict/gems.tpl
@@ -1401,19 +1401,35 @@
(0043,0098) VERS="GEM" VR="UI" VM="1" Owner="GEMS_PARM_01" Keyword="ASSETAcquisitionCalibrationSeriesUID" Name="ASSET Acquisition Calibration Series UID"
(0043,0099) VERS="GEM" VR="LO" VM="1-n" Owner="GEMS_PARM_01" Keyword="ExtendedOptions" Name="Extended Options"
(0043,009a) VERS="GEM" VR="IS" VM="1" Owner="GEMS_PARM_01" Keyword="RxStackIdentification" Name="Rx Stack Identification"
-(0045,0004) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="AES" Name="AES"
+
+(0045,0001) VERS="GEM" VR="LO" VM="1" Owner="GEMS_SENO_02" Keyword="DigitalSenographConfiguration" Name="Digital Senograph Configuration"
+(0045,0002) VERS="GEM" VR="LT" VM="1" Owner="GEMS_SENO_02" Keyword="SystemSeriesDescription" Name="System Series Description"
+(0045,0003) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="Track" Name="Track"
+(0045,0004) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="AES" Name="AES"
+(0045,0004) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="ExposureStatus" Name="Exposure Status"
(0045,0006) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="Angulation" Name="Angulation"
-(0045,0009) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="RealMagnificationFactor" Name="Real Magnification Factor"
+(0045,0007) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="CompressionThickness" Name="Compression Thickness"
+(0045,0008) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="CompressionForce" Name="Compression Force"
+(0045,0009) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="RealMagnificationFactor" Name="Real Magnification Factor"
+(0045,000a) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="DisplayedMagnificationFactor" Name="Displayed Magnification Factor"
(0045,000b) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="SenographType" Name="Senograph Type"
(0045,000c) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="IntegrationTime" Name="Integration Time"
(0045,000d) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ROIOriginXY" Name="ROI Origin X and Y"
+(0045,000e) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="CorrectionType" Name="Correction Type"
+(0045,000f) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="AcquisitionType" Name="Acquisition Type"
+(0045,0010) VERS="GEM" VR="DS" VM="2" Owner="GEMS_SENO_02" Keyword="CCDTemperature" Name="CCD Temperature"
(0045,0011) VERS="GEM" VR="DS" VM="2" Owner="GEMS_SENO_02" Keyword="ReceptorSizeCmXY" Name="Receptor Size cm X and Y"
-(0045,0012) VERS="GEM" VR="IS" VM="2" Owner="GEMS_SENO_02" Keyword="ReceptorSizePixelsXY" Name="Receptor Size Pixels X and Y"
-(0045,0013) VERS="GEM" VR="ST" VM="1" Owner="GEMS_SENO_02" Keyword="Screen" Name="Screen"
+(0045,0012) VERS="GEM" VR="IS" VM="2" Owner="GEMS_SENO_02" Keyword="ReceptorSizePixelsXY" Name="Receptor Size Pixels X and Y"
+(0045,0013) VERS="GEM" VR="ST" VM="1" Owner="GEMS_SENO_02" Keyword="Screen" Name="Screen"
(0045,0014) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="PixelPitchMicrons" Name="Pixel Pitch Microns"
(0045,0015) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="PixelDepthBits" Name="Pixel Depth Bits"
(0045,0016) VERS="GEM" VR="IS" VM="2" Owner="GEMS_SENO_02" Keyword="BinningFactorXY" Name="Binning Factor X and Y"
+(0045,0017) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="QuantumGain" Name="Quantum Gain"
+(0045,0018) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ElectronEDURatio" Name="Electron/EDU Ratio"
+(0045,0019) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ElectronicGain" Name="Electronic Gain"
+(0045,001A) VERS="GEM" VR="OB" VM="1" Owner="GEMS_SENO_02" Keyword="IDSDataBuffer" Name="IDS Data Buffer"
(0045,001B) VERS="GEM" VR="LO" VM="1" Owner="GEMS_SENO_02" Keyword="ClinicalView" Name="Clinical View"
+(0045,001C) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENO_02" Keyword="BreastLaterality" Name="Breast Laterality"
(0045,001D) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="MeanOfRawGrayLevels" Name="Mean Of Raw Gray Levels"
(0045,001E) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="MeanOfOffsetGrayLevels" Name="Mean Of Offset Gray Levels"
(0045,001F) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="MeanOfCorrectedGrayLevels" Name="Mean Of Corrected Gray Levels"
@@ -1429,6 +1445,19 @@
(0045,0029) VERS="GEM" VR="DS" VM="1-n" Owner="GEMS_SENO_02" Keyword="WindowingParameters" Name="WindowingParameters"
(0045,002a) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="CrosshairCursorXCoordinates" Name="Crosshair Cursor X Coordinates"
(0045,002b) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="CrosshairCursorYCoordinates" Name="Crosshair Cursor Y Coordinates"
+(0045,002c) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkAX3DCoordinates" Name="Reference Landmark A X 3D Coordinates"
+(0045,002d) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkAY3DCoordinates" Name="Reference Landmark A Y 3D Coordinates"
+(0045,002e) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkAZ3DCoordinates" Name="Reference Landmark A Z 3D Coordinates"
+(0045,002f) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkAXImageCoordinates" Name="Reference Landmark A X Image Coordinates"
+(0045,0030) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkAYImageCoordinates" Name="Reference Landmark A Y Image Coordinates"
+(0045,0031) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkBX3DCoordinates" Name="Reference Landmark B X 3D Coordinates"
+(0045,0032) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkBY3DCoordinates" Name="Reference Landmark B Y 3D Coordinates"
+(0045,0033) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkBZ3DCoordinates" Name="Reference Landmark B Z 3D Coordinates"
+(0045,0034) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkBXImageCoordinates" Name="Reference Landmark B X Image Coordinates"
+(0045,0035) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENO_02" Keyword="ReferenceLandmarkBYImageCoordinates" Name="Reference Landmark B Y Image Coordinates"
+(0045,0036) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="XRaySourceXLocation" Name="X-Ray Source X Location"
+(0045,0037) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="XRaySourceYLocation" Name="X-Ray Source Y Locatio"
+(0045,0038) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="XRaySourceZLocation" Name="X-Ray Source Z Locatio"
(0045,0039) VERS="GEM" VR="US" VM="1" Owner="GEMS_SENO_02" Keyword="VignetteRows" Name="Vignette Rows"
(0045,003a) VERS="GEM" VR="US" VM="1" Owner="GEMS_SENO_02" Keyword="VignetteColumns" Name="Vignette Columns"
(0045,003b) VERS="GEM" VR="US" VM="1" Owner="GEMS_SENO_02" Keyword="VignetteBitsAllocated" Name="Vignette Bits Allocated"
@@ -1464,7 +1493,12 @@
(0045,00A6) VERS="GEM" VR="UI" VM="1" Owner="GEMS_SENO_02" Keyword="SOPInstanceUIDForLossyCompression" Name="SOP Instance UID for Lossy Compression"
(0045,00A7) VERS="GEM" VR="LT" VM="1" Owner="GEMS_SENO_02" Keyword="ReconstructionParameters" Name="Reconstruction Parameters"
(0045,00A8) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="EntranceDoseIndGyForCompleteDBTSequence" Name="Entrance Dose in dGy for Complete DBT Sequence"
-(0045,00AD) VERS="GEM" VR="LO" VM="1-n" Owner="GEMS_SENO_02" Keyword="?" Name="?"
+(0045,00A9) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="ReplacementImage" Name="Replacement Image"
+(0045,00AA) VERS="GEM" VR="SQ" VM="1" Owner="GEMS_SENO_02" Keyword="ReplacemeImageSequence" Name="Replaced Image Sequence"
+(0045,00AB) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="CumulativeOrganDoseIndGy" Name="Cumulative Organ Dose in dGy"
+(0045,00AC) VERS="GEM" VR="DS" VM="1" Owner="GEMS_SENO_02" Keyword="CumulativeEntranceDoseInmGy" Name="Cumulative Entrance dose in mGy"
+(0045,00AD) VERS="GEM" VR="LO" VM="1-n" Owner="GEMS_SENO_02" Keyword="PaddleProperties" Name="Paddle Properties"
+
(0045,0001) VERS="GEM" VR="SS" VM="1" Owner="GEMS_HELIOS_01" Keyword="NumberOfMacroRowsInDetector" Name="Number of Macro Rows in Detector"
(0045,0002) VERS="GEM" VR="FL" VM="1" Owner="GEMS_HELIOS_01" Keyword="MacroWidthAtISOCenter" Name="Macro width at ISO Center"
(0045,0003) VERS="GEM" VR="SS" VM="1" Owner="GEMS_HELIOS_01" Keyword="DASType" Name="DAS type"
@@ -1584,8 +1618,7 @@
(0055,0063) VERS="GEM" VR="SQ" VM="1" Owner="GEMS_GENIE_1" Keyword="eNTEGRADataInformationSequence" Name="eNTEGRA Data Information Sequence"
(0055,0064) VERS="GEM" VR="SQ" VM="1" Owner="GEMS_GENIE_1" Keyword="SDODoubleDataSequence" Name="SDO Double Data Sequence"
(0055,0065) VERS="GEM" VR="SQ" VM="1" Owner="GEMS_GENIE_1" Keyword="?" Name="?"
-
-(3101,0010) VERS="GEM" VR="SQ" VM="1" Owner="AMI Annotations_01" Keyword="AnnotationSequence" Name="Annotation Sequence"
+3101,0010) VERS="GEM" VR="SQ" VM="1" Owner="AMI Annotations_01" Keyword="AnnotationSequence" Name="Annotation Sequence"
(3101,0020) VERS="GEM" VR="SQ" VM="1" Owner="AMI Annotations_02" Keyword="AnnotationSequence" Name="Annotation Sequence"
(3103,0010) VERS="GEM" VR="CS" VM="1" Owner="AMI Sequence Annotations_01" Keyword="AnnotationSequence" Name="Annotation Sequence"
(3103,0020) VERS="GEM" VR="UI" VM="1" Owner="AMI Sequence Annotations_01" Keyword="AnnotationUID" Name="Annotation UID"
@@ -2169,8 +2202,19 @@
(0051,000c) VERS="GEM" VR="SL" VM="1" Owner="GEMS_FUNCTOOL_01" Keyword="WizardStateDataSize" Name="Wizard State Data Size" # in MRI, this has been used as VR LO Analysis Package :(
(0051,000d) VERS="GEM" VR="OB" VM="1" Owner="GEMS_FUNCTOOL_01" Keyword="WizardState" Name="Wizard State"
-(0073,0020) VERS="GEM" VR="DS" VM="1" Owner="GEMS_IDI_01" Keyword="?" Name="?"
-(0073,0021) VERS="GEM" VR="DS" VM="1" Owner="GEMS_IDI_01" Keyword="?" Name="?"
-(0073,0030) VERS="GEM" VR="OW" VM="1" Owner="GEMS_IDI_01" Keyword="Height Map" Name="Height Map"
-(0073,0040) VERS="GEM" VR="DS" VM="1" Owner="GEMS_IDI_01" Keyword="?" Name="?"
-(0073,0050) VERS="GEM" VR="DS" VM="1-n" Owner="GEMS_IDI_01" Keyword="?" Name="?"
+(0073,0020) VERS="GEM" VR="DS" VM="1" Owner="GEMS_IDI_01" Keyword="HeightMapPlaneDistance" Name="Height Map Plane Distance"
+(0073,0021) VERS="GEM" VR="DS" VM="1" Owner="GEMS_IDI_01" Keyword="HeightMapPlaneOffset" Name="Height Map Plane Offset"
+(0073,0030) VERS="GEM" VR="OW" VM="1" Owner="GEMS_IDI_01" Keyword="HeightMapPlaneIndices" Name="Height Map Plane Indices"
+(0073,0031) VERS="GEM" VR="OW" VM="1" Owner="GEMS_IDI_01" Keyword="XMapPlaneIndices" Name="X Map Plane Indices"
+(0073,0032) VERS="GEM" VR="OW" VM="1" Owner="GEMS_IDI_01" Keyword="YMapPlaneIndices" Name="Y Map Plane Indices"
+(0073,0040) VERS="GEM" VR="DS" VM="1" Owner="GEMS_IDI_01" Keyword="CentralProjectionDetectorSecondaryAngle" Name="Central Projection Detector Secondary Angle"
+(0073,0050) VERS="GEM" VR="DS" VM="2" Owner="GEMS_IDI_01" Keyword="DetectorActiveDimensions" Name="Detector Active Dimensions"
+
+(0055,0000) VERS="GEM" VR="CS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="ClinicalView" Name="Clinical View"
+(0055,0001) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="ExposureDose" Name="Exposure Dose"
+(0055,0002) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="ImplantDisplacement" Name="Implant Displacement"
+(0055,0003) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="PaddleType" Name="Paddle Type"
+(0055,0004) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="ProcessingType" Name="Processing Type"
+(0055,0005) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="WindowingType" Name="Windowing Type"
+(0055,0006) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="Saturation" Name="Saturation"
+(0055,0007) VERS="GEM" VR="IS" VM="1" Owner="GEMS_SENOCRYSTAL_V1" Keyword="Clip" Name="Clip"
diff --git a/libsrc/standard/elmdict/other.tpl b/libsrc/standard/elmdict/other.tpl
index 2adaa9e..ea507ec 100755
--- a/libsrc/standard/elmdict/other.tpl
+++ b/libsrc/standard/elmdict/other.tpl
@@ -2150,3 +2150,30 @@
(0029,0004) VERS="TLM" VR="US" VM="1" Owner="TELEMIS" Keyword="?" Name="?"
+(0117,0010) VERS="UCSF" VR="SQ" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0012) VERS="UCSF" VR="CS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0014) VERS="UCSF" VR="LO" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0016) VERS="UCSF" VR="LO" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0019) VERS="UCSF" VR="IS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0020) VERS="UCSF" VR="SQ" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0030) VERS="UCSF" VR="IS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0031) VERS="UCSF" VR="DS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0033) VERS="UCSF" VR="TM" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0034) VERS="UCSF" VR="DS" VM="3" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0035) VERS="UCSF" VR="IS" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,003a) VERS="UCSF" VR="LO" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,003b) VERS="UCSF" VR="LT" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0041) VERS="UCSF" VR="IS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0042) VERS="UCSF" VR="DS" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0043) VERS="UCSF" VR="DS" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0044) VERS="UCSF" VR="DS" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0045) VERS="UCSF" VR="DS" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,0046) VERS="UCSF" VR="CS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,00a1) VERS="UCSF" VR="US" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,00a2) VERS="UCSF" VR="US" VM="1-n" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,00b0) VERS="UCSF" VR="SQ" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,00b1) VERS="UCSF" VR="DS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,00b2) VERS="UCSF" VR="DS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(0117,00b3) VERS="UCSF" VR="IS" VM="1" Owner="UCSF BIRP PRIVATE CREATOR 011710xx" Keyword="?" Name="?"
+(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="?"
diff --git a/libsrc/standard/elmdict/siemens.tpl b/libsrc/standard/elmdict/siemens.tpl
index ce5316a..9ddcc16 100755
--- a/libsrc/standard/elmdict/siemens.tpl
+++ b/libsrc/standard/elmdict/siemens.tpl
@@ -2325,19 +2325,20 @@
(0019,0089) VERS="SSPI" VR="LO" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="?" Name="?"
(0119,0000) VERS="SSPI" VR="LO" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticMetaInformationVersion" Name="Acoustic Meta Information Version"
-(0119,0001) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="CommonAcousticMetaInformation" Name="Common Acoustic Meta Information"
+(0119,0001) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="CommonAcousticMetaInformation" Name="Common Acoustic Meta Information"
(0119,0002) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="MultiStreamSequence" Name="Multi Stream Sequence"
(0119,0003) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticDataSequence" Name="Acoustic Data Sequence"
-(0119,0004) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="PerTransactionAcousticControlInformation" Name="Per Transaction Acoustic Control Information"
-(0119,0005) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticDataOffset" Name="Acoustic Data Offset"
-(0119,0006) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticDataLength" Name="Acoustic Data Length"
-(0119,0007) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="FooterOffset" Name="Footer Offset"
-(0119,0008) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="FooterLength" Name="Footer Length"
-(0119,0009) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticStreamNumber" Name="Acoustic Stream Number"
-(0119,0010) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticStreamType" Name="Acoustic Stream Type"
+(0119,0004) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="PerTransactionAcousticControlInformation" Name="Per Transaction Acoustic Control Information" RenderAsString="true"
+(0119,0005) VERS="SSPI" VR="UL" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticDataOffset" Name="Acoustic Data Offset"
+(0119,0006) VERS="SSPI" VR="UL" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticDataLength" Name="Acoustic Data Length"
+(0119,0007) VERS="SSPI" VR="UL" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="FooterOffset" Name="Footer Offset"
+(0119,0008) VERS="SSPI" VR="UL" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="FooterLength" Name="Footer Length"
+(0119,0009) VERS="SSPI" VR="SS" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticStreamNumber" Name="Acoustic Stream Number"
+(0119,0010) VERS="SSPI" VR="SH" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticStreamType" Name="Acoustic Stream Type"
(0119,0011) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="StageTimerTime" Name="Stage Timer Time"
(0119,0012) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="StopWatchTime" Name="Stop Watch Time"
-(0119,0013) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VolumeRate" Name="Volume Rate"
+(0119,0013) VERS="SSPI" VR="IS" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VolumeRate" Name="Volume Rate"
+(0119,0021) VERS="SSPI" VR="SH" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="?" Name="?"
(0129,0000) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="MPRViewSequence" Name="MPR View Sequence"
(0129,0002) VERS="SSPI" VR="UI" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="BookmarkUID" Name="Bookmark UID"
@@ -2346,14 +2347,15 @@
(0129,0005) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ColumnVector" Name="Column Vector"
(0129,0006) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VisualizationSequence" Name="Visualization Sequence"
(0129,0007) VERS="SSPI" VR="UI" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="BookmarkUID" Name="Bookmark UID"
-(0129,0008) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VisualizationInformation" Name="Visualization Information"
+(0129,0008) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VisualizationInformation" Name="Visualization Information" RenderAsString="true"
(0129,0009) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ApplicationStateSequence" Name="Application State Sequence"
-(0129,0010) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ApplicationStateInformation" Name="Application State Information"
+(0129,0010) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ApplicationStateInformation" Name="Application State Information" RenderAsString="true"
(0129,0011) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ReferencedBookmarkSequence" Name="Referenced Bookmark Sequence"
(0129,0012) VERS="SSPI" VR="UI" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ReferencedBookmarkUID" Name="Referenced Bookmark UID"
(0129,0020) VERS="SSPI" VR="SQ" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="CineParametersSequence" Name="Cine Parameters Sequence"
-(0129,0021) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="CineParametersSchema" Name="Cine Parameters Schema"
-(0129,0022) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ValuesOfCineParameters" Name="Values of Cine Parameters"
+(0129,0021) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="CineParametersSchema" Name="Cine Parameters Schema" RenderAsString="true"
+(0129,0022) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="ValuesOfCineParameters" Name="Values of Cine Parameters"
+(0129,0029) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="?" Name="?" RenderAsString="true"
(0129,0030) VERS="SSPI" VR="CS" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="RawDataObjectType" Name="Raw Data Object Type"
(0139,0001) VERS="SSPI" VR="SL" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="PhysioCaptureROI" Name="Physio Capture ROI"
@@ -2362,10 +2364,15 @@
(0149,0002) VERS="SSPI" VR="FD" VM="1-n" Owner="SIEMENS Ultrasound SC2000" Keyword="StartEndTimestampsOfStripStream" Name="Start/End Timestamps of Strip Stream"
(0149,0003) VERS="SSPI" VR="FD" VM="1-n" Owner="SIEMENS Ultrasound SC2000" Keyword="TimestampsOfVisibleRWaves" Name="Timestamps of Visible R-waves"
-(7FD1,0001) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticImageAndFooterData" Name="Acoustic Image and Footer Data"
-(7FD1,0009) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VolumeVersionID" Name="Volume Version ID"
-(7FD1,0010) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VolumePayload" Name="Volume Payload"
-(7FD1,0011) VERS="SSPI" VR="UN" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AfterPayload" Name="After Payload"
+(7FD1,0001) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AcousticImageAndFooterData" Name="Acoustic Image and Footer Data"
+(7FD1,0009) VERS="SSPI" VR="UI" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VolumeVersionID" Name="Volume Version ID"
+(7FD1,0010) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="VolumePayload" Name="Volume Payload"
+(7FD1,0011) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS Ultrasound SC2000" Keyword="AfterPayload" Name="After Payload"
+
+(7FD1,0001) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="Padding" Name="Padding"
+(7FD1,0009) VERS="SSPI" VR="UI" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="VolumeVersionID" Name="Volume Version ID"
+(7FD1,0010) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="VolumePayload" Name="Volume Payload"
+(7FD1,0011) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="AfterPayload" Name="After Payload"
(7FDF,00FC) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS SYNGO DATA PADDING" Keyword="PixelDataLeadingPadding" Name="Pixel Data Leading Padding"
@@ -3337,11 +3344,6 @@
(300B,00F0) VERS="SSPI" VR="DS" VM="1" Owner="SIEMENS MED SYNGO RT" Keyword="DoseStatisticalUncertainty" Name="Dose Statistical Uncertainty"
(300B,00F1) VERS="SSPI" VR="CS" VM="1" Owner="SIEMENS MED SYNGO RT" Keyword="InterpretedRadiationType" Name="Interpreted Radiation Type"
-(7FD1,0001) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="Padding" Name="Padding"
-(7FD1,0009) VERS="SSPI" VR="OB" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="VersionID" Name="Version ID"
-(7FD1,0010) VERS="SSPI" VR="LO" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="Payload" Name="Payload"
-(7FD1,0011) VERS="SSPI" VR="LO" VM="1" Owner="SIEMENS SYNGO ULTRA-SOUND TOYON DATA STREAMING" Keyword="AfterPayload" Name="After Payload"
-
(0021,0000) VERS="SSPI" VR="US" VM="1" Owner="SIEMENS Ultrasound S2000" Keyword="NipplePosition" Name="Nipple Position"
(0021,0001) VERS="SSPI" VR="US" VM="1" Owner="SIEMENS Ultrasound S2000" Keyword="ABVSClipDerivedFromVolume" Name="ABVS Clip Derived From Volume"
diff --git a/libsrc/standard/iodcomp/base.tpl b/libsrc/standard/iodcomp/base.tpl
index 0db812c..3711f3f 100755
--- a/libsrc/standard/iodcomp/base.tpl
+++ b/libsrc/standard/iodcomp/base.tpl
@@ -21,6 +21,7 @@ CompositeIOD="CRImage" Condition="CRImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -61,6 +62,7 @@ CompositeIOD="CTImage" Condition="CTImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePlane" Usage="M"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
@@ -100,6 +102,7 @@ CompositeIOD="MRImage" Condition="MRImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePlane" Usage="M"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
@@ -140,6 +143,7 @@ CompositeIOD="NMImage" Condition="NMImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="AcquisitionContext" Usage="U" Condition="NeedModuleAcquisitionContext"
Module="Device" Usage="U" Condition="NeedModuleDevice"
@@ -190,6 +194,7 @@ CompositeIOD="USImage" Condition="USImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
Module="PaletteColorLookupTable" Usage="C" Condition="PhotometricInterpretationIsPaletteColor"
@@ -232,6 +237,7 @@ CompositeIOD="USMultiFrameImage" Condition="USMultiFrameImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
Module="Cine" Usage="M"
@@ -273,6 +279,7 @@ CompositeIOD="SCImage" Condition="SCImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="Device" Usage="U" Condition="NeedModuleDevice"
Module="Specimen" Usage="U" Condition="NeedModuleSpecimen"
@@ -310,6 +317,7 @@ CompositeIOD="MultiframeSingleBitSCImage" Condition="MultiframeSingleBitSCImag
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="Cine" Usage="C" Condition="NeedModuleCineForSC"
Module="MultiFrame" Usage="M"
@@ -354,6 +362,7 @@ CompositeIOD="MultiframeGrayscaleByteSCImage" Condition="MultiframeGrayscaleBy
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="Cine" Usage="C" Condition="NeedModuleCineForSC"
Module="MultiFrame" Usage="M"
@@ -402,6 +411,7 @@ CompositeIOD="MultiframeGrayscaleWordSCImage" Condition="MultiframeGrayscaleWo
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="Cine" Usage="C" Condition="NeedModuleCineForSC"
Module="MultiFrame" Usage="M"
@@ -450,6 +460,7 @@ CompositeIOD="MultiframeTrueColorSCImage" Condition="MultiframeTrueColorSCIma
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="Cine" Usage="C" Condition="NeedModuleCineForSC"
Module="MultiFrame" Usage="M"
@@ -607,6 +618,7 @@ CompositeIOD="Segmentation" Condition="SegmentationInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="SegmentationImage" Usage="M"
Module="CommonInstanceReference" Usage="C" Condition="DerivationImageFunctionalGroupPresent"
@@ -649,6 +661,7 @@ CompositeIOD="SurfaceSegmentation" Condition="SurfaceSegmentationInstance"
Module="SurfaceSegmentation" Usage="M"
Module="SurfaceMesh" Usage="M"
Module="CommonInstanceReference" Usage="C" Condition="NeedModuleCommonInstanceReference"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
InformationEntityEnd
CompositeIODEnd
@@ -680,6 +693,7 @@ CompositeIOD="SpatialRegistration" Condition="SpatialRegistrationInstance"
InformationEntity="SpatialRegistration"
Module="SpatialRegistration" Usage="M"
Module="CommonInstanceReference" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
InformationEntityEnd
CompositeIODEnd
@@ -712,6 +726,7 @@ CompositeIOD="DeformableSpatialRegistration" Condition="DeformableSpatialRegis
InformationEntity="SpatialRegistration"
Module="DeformableSpatialRegistration" Usage="M"
Module="CommonInstanceReference" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
InformationEntityEnd
CompositeIODEnd
@@ -740,6 +755,7 @@ CompositeIOD="SpatialFiducials" Condition="SpatialFiducialsInstance"
InformationEntity="SpatialFiducials"
Module="SpatialFiducials" Usage="M"
Module="CommonInstanceReference" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
InformationEntityEnd
CompositeIODEnd
@@ -902,6 +918,7 @@ CompositeIOD="ParametricMap" Condition="ParametricMapInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="C" Condition="PixelDataPresent"
Module="FloatingPointImagePixel" Usage="C" Condition="FloatPixelDataPresent"
Module="DoubleFloatingPointImagePixel" Usage="C" Condition="DoubleFloatPixelDataPresent"
diff --git a/libsrc/standard/iodcomp/dx.tpl b/libsrc/standard/iodcomp/dx.tpl
index 7fa6850..aef850a 100755
--- a/libsrc/standard/iodcomp/dx.tpl
+++ b/libsrc/standard/iodcomp/dx.tpl
@@ -24,6 +24,7 @@ CompositeIOD="DXImageForProcessing" Condition="DXImageForProcessingInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -76,6 +77,7 @@ CompositeIOD="DXImageForPresentation" Condition="DXImageForPresentationInstanc
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -129,6 +131,7 @@ CompositeIOD="MammographyImageForProcessing" Condition="MammographyImageForPro
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -183,6 +186,7 @@ CompositeIOD="MammographyImageForPresentation" Condition="MammographyImageForP
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -237,6 +241,7 @@ CompositeIOD="MammographyImageForProcessingIHEMammo" Condition="MammographyIma
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -293,6 +298,7 @@ CompositeIOD="MammographyImageForProcessingIHEMammoPartialViewOption" Conditio
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -349,6 +355,7 @@ CompositeIOD="MammographyImageForPresentationIHEMammo" Condition="MammographyI
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -406,6 +413,7 @@ CompositeIOD="MammographyImageForPresentationIHEMammoPartialViewOption" Condit
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -463,6 +471,7 @@ CompositeIOD="IntraoralImageForProcessing" Condition="IntraoralImageForProcess
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -517,6 +526,7 @@ CompositeIOD="IntraoralImageForPresentation" Condition="IntraoralImageForPrese
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -571,6 +581,7 @@ CompositeIOD="IntraoralImageForPresentationDentalMedia" Condition="IntraoralIm
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
@@ -625,6 +636,7 @@ CompositeIOD="DXImageForPresentationDentalMedia" Condition="DXImageForPresenta
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="U" Condition="NeedModuleContrastBolus"
Module="DisplayShutter" Usage="U" Condition="NeedModuleDisplayShutter"
diff --git a/libsrc/standard/iodcomp/pet.tpl b/libsrc/standard/iodcomp/pet.tpl
index 118c7d3..d5c940b 100755
--- a/libsrc/standard/iodcomp/pet.tpl
+++ b/libsrc/standard/iodcomp/pet.tpl
@@ -27,6 +27,7 @@ CompositeIOD="PETImage" Condition="PETImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePlane" Usage="M"
Module="ImagePixel" Usage="M"
Module="Device" Usage="U" Condition="NeedModuleDevice"
diff --git a/libsrc/standard/iodcomp/rt.tpl b/libsrc/standard/iodcomp/rt.tpl
index 5f268c7..ad127cf 100755
--- a/libsrc/standard/iodcomp/rt.tpl
+++ b/libsrc/standard/iodcomp/rt.tpl
@@ -23,6 +23,7 @@ CompositeIOD="RTImage" Condition="RTImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
Module="Cine" Usage="C" Condition="NeedModuleCine"
@@ -62,6 +63,7 @@ CompositeIOD="RTDose" Condition="RTDoseInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="C" Condition="DoseDataGridbased"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePlane" Usage="C" Condition="DoseDataGridbased"
Module="ImagePixel" Usage="C" Condition="DoseDataGridbased"
Module="MultiFrame" Usage="C" Condition="DoseDataGridbasedAndNeedModuleMultiFrame"
@@ -104,6 +106,7 @@ CompositeIOD="RTStructureSet" Condition="RTStructureSetInstance"
Module="ROIContour" Usage="M"
Module="RTROIObservations" Usage="M"
Module="Approval" Usage="U" Condition="NeedModuleApproval"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
@@ -141,6 +144,7 @@ CompositeIOD="RTPlan" Condition="RTPlanInstance"
Module="RTBeams" Usage="C" Condition="NeedRTBeams"
Module="RTBrachyApplicationSetups" Usage="C" Condition="NeedRTBrachyApplicationSetups"
Module="Approval" Usage="U" Condition="NeedModuleApproval"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
@@ -174,8 +178,9 @@ CompositeIOD="RTBeamsTreatmentRecord" Condition="RTBeamsTreatmentRecordInstanc
Module="CalculatedDoseReferenceRecord" Usage="U" Condition="NeedModuleCalculatedDoseReferenceRecord"
Module="RTBeamsSessionRecord" Usage="M"
Module="RTTreatmentSummaryRecord" Usage="U" Condition="NeedModuleRTTreatmentSummaryRecord"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
- Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
+ Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
CompositeIODEnd
@@ -207,8 +212,9 @@ CompositeIOD="RTBrachyTreatmentRecord" Condition="RTBrachyTreatmentRecordInsta
Module="CalculatedDoseReferenceRecord" Usage="U" Condition="NeedModuleCalculatedDoseReferenceRecord"
Module="RTBrachySessionRecord" Usage="M"
Module="RTTreatmentSummaryRecord" Usage="U" Condition="NeedModuleRTTreatmentSummaryRecord"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
- Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
+ Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
CompositeIODEnd
@@ -235,6 +241,7 @@ CompositeIOD="RTTreatmentSummaryRecord" Condition="RTTreatmentSummaryRecordIns
InformationEntity="TreatmentRecord"
Module="RTGeneralTreatmentRecord" Usage="M"
Module="RTTreatmentSummaryRecord" Usage="U" Condition="NeedModuleRTTreatmentSummaryRecord"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
@@ -271,6 +278,7 @@ CompositeIOD="RTIonPlan" Condition="RTIonPlanInstance"
Module="RTFractionScheme" Usage="U" Condition="NeedModuleRTFractionScheme"
Module="RTIonBeams" Usage="C" Condition="NeedRTIonBeams"
Module="Approval" Usage="U" Condition="NeedModuleApproval"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
@@ -304,8 +312,9 @@ CompositeIOD="RTIonBeamsTreatmentRecord" Condition="RTIonBeamsTreatmentRecordI
Module="CalculatedDoseReferenceRecord" Usage="U" Condition="NeedModuleCalculatedDoseReferenceRecord"
Module="RTIonBeamsSessionRecord" Usage="M"
Module="RTTreatmentSummaryRecord" Usage="U" Condition="NeedModuleRTTreatmentSummaryRecord"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="SOPCommon" Usage="M"
- Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
+ Module="CommonInstanceReference" Usage="U" Condition="NeedModuleCommonInstanceReference"
InformationEntityEnd
CompositeIODEnd
diff --git a/libsrc/standard/iodcomp/sr.tpl b/libsrc/standard/iodcomp/sr.tpl
index ffd682a..0beb596 100755
--- a/libsrc/standard/iodcomp/sr.tpl
+++ b/libsrc/standard/iodcomp/sr.tpl
@@ -133,6 +133,34 @@ CompositeIOD="KeyObjectSelectionDocument" Condition="KeyObjectSelectionDocument
InformationEntityEnd
CompositeIODEnd
+CompositeIOD="KeyObjectSelectionDocumentIHEXDSIManifest" Condition="KeyObjectSelectionDocumentStorageInstance" Profile="IHEXDSIManifest"
+ InformationEntity="File"
+ Module="FileMetaInformation" Usage="C" Condition="NeedModuleFileMetaInformation"
+ InformationEntityEnd
+ InformationEntity="Patient"
+ Module="Patient" Usage="M"
+ Module="ClinicalTrialSubject" Usage="U" Condition="NeedModuleClinicalTrialSubject"
+ InformationEntityEnd
+ InformationEntity="Study"
+ Module="GeneralStudy" Usage="M"
+ Module="PatientStudy" Usage="U"
+ Module="ClinicalTrialStudy" Usage="U" Condition="NeedModuleClinicalTrialStudy"
+ InformationEntityEnd
+ InformationEntity="Series"
+ Module="KeyObjectDocumentSeries" Usage="M"
+ Module="ClinicalTrialSeries" Usage="U" Condition="NeedModuleClinicalTrialSeries"
+ InformationEntityEnd
+ InformationEntity="Equipment"
+ Module="GeneralEquipment" Usage="M"
+ InformationEntityEnd
+ InformationEntity="Document"
+ Module="KeyObjectDocument" Usage="M"
+ Module="SRDocumentContent" Usage="M"
+ Module="SOPCommon" Usage="M"
+ Module="IHEXDSIManifestProfile" Usage="M"
+ InformationEntityEnd
+CompositeIODEnd
+
CompositeIOD="MammographyCADSR" Condition="MammographyCADSRStorageInstance"
InformationEntity="File"
Module="FileMetaInformation" Usage="C" Condition="NeedModuleFileMetaInformation"
diff --git a/libsrc/standard/iodcomp/us.tpl b/libsrc/standard/iodcomp/us.tpl
index 4ffa30d..29467d0 100644
--- a/libsrc/standard/iodcomp/us.tpl
+++ b/libsrc/standard/iodcomp/us.tpl
@@ -27,6 +27,7 @@ CompositeIOD="EnhancedUltrasoundVolume" Condition="EnhancedUltrasoundVolumeIns
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="EnhancedContrastBolus" Usage="C" Condition="NeedModuleEnhancedContrastBolus"
Module="MultiFrameFunctionalGroupsCommon" Usage="M"
@@ -81,6 +82,7 @@ CompositeIOD="EnhancedUltrasoundVolumeQTUS" Condition="EnhancedUltrasoundVolum
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="EnhancedContrastBolus" Usage="C" Condition="NeedModuleEnhancedContrastBolus"
Module="MultiFrameFunctionalGroupsCommon" Usage="M"
diff --git a/libsrc/standard/iodcomp/vl.tpl b/libsrc/standard/iodcomp/vl.tpl
index 1271929..1eb11b3 100755
--- a/libsrc/standard/iodcomp/vl.tpl
+++ b/libsrc/standard/iodcomp/vl.tpl
@@ -21,6 +21,7 @@ CompositeIOD="VLEndoscopicImage" Condition="VisibleLightEndoscopicImageInstance
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="AcquisitionContext" Usage="M" # not check for baseline CIDs yet
Module="Device" Usage="U" Condition="NeedModuleDevice"
@@ -57,6 +58,7 @@ CompositeIOD="VLMicroscopicImage" Condition="VisibleLightMicroscopicImageInstan
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="AcquisitionContext" Usage="M" # not check for baseline CIDs yet
Module="Device" Usage="U" Condition="NeedModuleDevice"
@@ -97,6 +99,7 @@ CompositeIOD="VLSlideCoordinatesMicroscopicImage" Condition="VisibleLightSlideC
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="AcquisitionContext" Usage="M" # not check for baseline CIDs yet
Module="Device" Usage="U" Condition="NeedModuleDevice"
@@ -135,6 +138,7 @@ CompositeIOD="VLPhotographicImage" Condition="VisibleLightPhotographicImageInst
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="AcquisitionContext" Usage="M" # not check for baseline CIDs yet
Module="Device" Usage="U" Condition="NeedModuleDevice"
@@ -171,6 +175,7 @@ CompositeIOD="VideoEndoscopicImage" Condition="VideoEndoscopicImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="Cine" Usage="M"
Module="MultiFrame" Usage="M"
Module="ImagePixel" Usage="M"
@@ -208,6 +213,7 @@ CompositeIOD="VideoMicroscopicImage" Condition="VideoMicroscopicImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="Cine" Usage="M"
Module="MultiFrame" Usage="M"
Module="ImagePixel" Usage="M"
@@ -245,6 +251,7 @@ CompositeIOD="VideoPhotographicImage" Condition="VideoPhotographicImageInstance
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="Cine" Usage="M"
Module="MultiFrame" Usage="M"
Module="ImagePixel" Usage="M"
@@ -285,6 +292,7 @@ CompositeIOD="OphthalmicPhotography8BitImage" Condition="OphthalmicPhotography8
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="EnhancedContrastBolus" Usage="C" Condition="NeedModuleEnhancedContrastBolus"
Module="Cine" Usage="C" Condition="NeedModuleCine"
@@ -328,6 +336,7 @@ CompositeIOD="OphthalmicPhotography16BitImage" Condition="OphthalmicPhotography
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="EnhancedContrastBolus" Usage="C" Condition="NeedModuleEnhancedContrastBolus"
Module="Cine" Usage="C" Condition="NeedModuleCine"
@@ -445,6 +454,7 @@ CompositeIOD="VLWholeSlideMicroscopyImage" Condition="VLWholeSlideMicroscopyIma
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="AcquisitionContext" Usage="M"
Module="MultiFrameFunctionalGroupsCommon" Usage="M"
diff --git a/libsrc/standard/iodcomp/xaxrf.tpl b/libsrc/standard/iodcomp/xaxrf.tpl
index 1960351..b263f2d 100755
--- a/libsrc/standard/iodcomp/xaxrf.tpl
+++ b/libsrc/standard/iodcomp/xaxrf.tpl
@@ -23,6 +23,7 @@ CompositeIOD="XAImage" Condition="XAImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
Module="Cine" Usage="C" Condition="NeedModuleCine"
@@ -74,6 +75,7 @@ CompositeIOD="XRFImage" Condition="XRFImageInstance"
InformationEntityEnd
InformationEntity="Image"
Module="GeneralImage" Usage="M"
+ Module="GeneralReference" Usage="U" Condition="NeedModuleGeneralReference"
Module="ImagePixel" Usage="M"
Module="ContrastBolus" Usage="C" Condition="NeedModuleContrastBolus"
Module="Cine" Usage="C" Condition="NeedModuleCine"
diff --git a/libsrc/standard/module/base.tpl b/libsrc/standard/module/base.tpl
index 9cb7f1c..7a3aca8 100755
--- a/libsrc/standard/module/base.tpl
+++ b/libsrc/standard/module/base.tpl
@@ -268,11 +268,17 @@ DefineMacro="ContentIdentificationMacro" InformationEntity="Instance"
Name="InstanceNumber" Type="1"
Name="ContentLabel" Type="1"
Name="ContentDescription" Type="2"
+ Sequence="ConceptNameCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
Sequence="AlternateContentDescriptionSequence" Type="3" VM="1-n"
Name="ContentDescription" Type="1"
Sequence="LanguageCodeSequence" Type="1" VM="1"
InvokeMacro="CodeSequenceMacro" DefinedContextID="5000"
SequenceEnd
+ Sequence="ConceptNameCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
SequenceEnd
Name="ContentCreatorName" Type="2"
Sequence="ContentCreatorIdentificationCodeSequence" Type="3" VM="1"
@@ -432,6 +438,11 @@ DefineMacro="PatientGroupMacro" InformationEntity="Patient"
SequenceEnd
MacroEnd
+DefineMacro="UDIMacro" InformationEntity="Equipment"
+ Name="UniqueDeviceIdentifier" Type="1"
+ Name="DeviceDescription" Type="3"
+MacroEnd
+
Module="Patient"
Name="PatientName" Type="2"
Name="PatientID" Type="2"
@@ -650,6 +661,9 @@ Module="GeneralEquipment"
Name="DeviceSerialNumber" Type="3"
Name="SoftwareVersions" Type="3"
Name="GantryID" Type="3"
+ Sequence="UDISequence" Type="3" VM="1-n"
+ InvokeMacro="UDIMacro"
+ SequenceEnd
Name="SpatialResolution" Type="3"
Name="DateOfLastCalibration" Type="3"
Name="TimeOfLastCalibration" Type="3"
@@ -664,24 +678,19 @@ Module="EnhancedGeneralEquipment"
Name="SoftwareVersions" Type="1"
ModuleEnd
-Module="GeneralImage"
- Name="InstanceNumber" Type="2"
- Name="PatientOrientation" Type="2C" Condition="PatientOrientationRequired" mbpo="true"
- # ImageDate and ImageTime real-world condition "images are temporally related"
- Name="ContentDate" Type="2C" NoCondition="" # "if temporally related" ... real world
- Name="ContentTime" Type="2C" NoCondition="" # "if temporally related" ... real world
- Name="ImageType" Type="3" ValueSelector="0" StringEnumValues="ImageType1"
- Verify="ImageType" Type="3" ValueSelector="1" StringEnumValues="ImageType2"
- Name="AcquisitionNumber" Type="3"
- Name="AcquisitionDate" Type="3"
- Name="AcquisitionTime" Type="3"
- Name="AcquisitionDateTime" Type="3"
+Module="GeneralReference"
Sequence="ReferencedImageSequence" Type="3" VM="1-n"
InvokeMacro="ImageSOPInstanceReferenceMacro"
Sequence="PurposeOfReferenceCodeSequence" Type="3" VM="1"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
SequenceEnd
+ Sequence="ReferencedInstanceSequence" Type="3" VM="1-n"
+ InvokeMacro="SOPInstanceReferenceMacro"
+ Sequence="PurposeOfReferenceCodeSequence" Type="1" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
+ SequenceEnd
Name="DerivationDescription" Type="3"
Sequence="DerivationCodeSequence" Type="3" VM="1-n"
InvokeMacro="CodeSequenceMacro"
@@ -694,12 +703,26 @@ Module="GeneralImage"
Name="SpatialLocationsPreserved" Type="3" StringEnumValues="YesNoReorientedOnly"
Name="PatientOrientation" Type="1C" Condition="SpatialLocationsPreservedReorientedOnly"
SequenceEnd
- Sequence="ReferencedInstanceSequence" Type="3" VM="1-n"
+ Sequence="SourceInstanceSequence" Type="3" VM="1-n" NoCondition=""
InvokeMacro="SOPInstanceReferenceMacro"
- Sequence="PurposeOfReferenceCodeSequence" Type="1" VM="1"
- InvokeMacro="CodeSequenceMacro"
+ Sequence="PurposeOfReferenceCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
SequenceEnd
SequenceEnd
+ModuleEnd
+
+Module="GeneralImage"
+ Name="InstanceNumber" Type="2"
+ Name="PatientOrientation" Type="2C" Condition="PatientOrientationRequired" mbpo="true"
+ # ImageDate and ImageTime real-world condition "images are temporally related"
+ Name="ContentDate" Type="2C" NoCondition="" # "if temporally related" ... real world
+ Name="ContentTime" Type="2C" NoCondition="" # "if temporally related" ... real world
+ Name="ImageType" Type="3" ValueSelector="0" StringEnumValues="ImageType1"
+ Verify="ImageType" Type="3" ValueSelector="1" StringEnumValues="ImageType2"
+ Name="AcquisitionNumber" Type="3"
+ Name="AcquisitionDate" Type="3"
+ Name="AcquisitionTime" Type="3"
+ Name="AcquisitionDateTime" Type="3"
Name="ImagesInAcquisition" Type="3"
Name="ImageComments" Type="3"
Name="QualityControlImage" Type="3" StringEnumValues="YesNoFull"
@@ -738,7 +761,7 @@ DefineMacro="ImagePixelMacro" InformationEntity="Instance"
Name="PhotometricInterpretation" Type="1" StringDefinedTerms="PhotometricInterpretation"
Verify="PhotometricInterpretation" Condition="JPEGLossyTransferSyntaxAndThreeSamples" StringEnumValues="PhotometricInterpretationYBRFull422"
- Verify="PhotometricInterpretation" Condition="JPEGLosslessTransferSyntaxAndThreeSamples" StringEnumValues="PhotometricInterpretationRGBorYBR_RCT"
+ Verify="PhotometricInterpretation" Condition="JPEGLosslessTransferSyntaxAndThreeSamples" StringEnumValues="PhotometricInterpretationYBRFullOrRGBorYBR_RCT"
Verify="PhotometricInterpretation" Condition="JPEG2000LosslessTransferSyntaxAndThreeSamples" StringEnumValues="PhotometricInterpretationYBRRCT"
Verify="PhotometricInterpretation" Condition="JPEG2000TransferSyntaxAndThreeSamples" StringEnumValues="PhotometricInterpretationYBRRCTOrICT"
Verify="PhotometricInterpretation" Condition="MPEG2TransferSyntax" StringEnumValues="PhotometricInterpretationYBRPartial420" # regardless of number of samples (required to be 3 by PS 3.5)
@@ -993,7 +1016,7 @@ MacroEnd
DefineMacro="ReferencedImageMacro" InformationEntity="FunctionalGroup"
Sequence="ReferencedImageSequence" Type="2" VM="0-n"
InvokeMacro="ImageSOPInstanceReferenceMacro"
- Sequence="PurposeOfReferenceCodeSequence" Type="1" VM="1"
+ Sequence="PurposeOfReferenceCodeSequence" Type="1C" VM="1" Condition="NotLegacyConvertedCTOrMROrPET" mbpo="true"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
SequenceEnd
@@ -1002,12 +1025,12 @@ MacroEnd
DefineMacro="DerivationImageMacro" InformationEntity="FunctionalGroup"
Sequence="DerivationImageSequence" Type="2" VM="0-n"
Name="DerivationDescription" Type="3"
- Sequence="DerivationCodeSequence" Type="1" VM="1-n"
+ Sequence="DerivationCodeSequence" Type="1C" VM="1-n" Condition="NotLegacyConvertedCTOrMROrPET" mbpo="true"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
Sequence="SourceImageSequence" Type="2" VM="0-n"
InvokeMacro="ImageSOPInstanceReferenceMacro"
- Sequence="PurposeOfReferenceCodeSequence" Type="1" VM="1"
+ Sequence="PurposeOfReferenceCodeSequence" Type="1C" VM="1" Condition="NotLegacyConvertedCTOrMROrPET" mbpo="true"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
SequenceEnd
@@ -2190,7 +2213,7 @@ Module="SegmentationImage"
Sequence="SegmentSequence" Type="1" VM="1-n"
InvokeMacro="SegmentDescriptionMacro"
Name="SegmentAlgorithmName" Type="1C" Condition="SegmentAlgorithmTypeIsNotManual"
- Sequence="SegmentSurfaceGenerationAlgorithmIdentificationSequence" Type="3" VM="1"
+ Sequence="SegmentationAlgorithmIdentificationSequence" Type="3" VM="1"
InvokeMacro="AlgorithmIdentificationMacro" BaselineContextID="7162"
SequenceEnd
Name="RecommendedDisplayGrayscaleValue" Type="3"
@@ -2283,6 +2306,12 @@ Module="SurfaceMesh"
Sequence="SurfaceSequence" Type="1" VM="1-n" # should check that number of items equals NumberOfSurfaces :(
Name="SurfaceNumber" Type="1" NotZeroError="" # should check that starts at a value of 1, and increases monotonically by 1 :(
Name="SurfaceComments" Type="3"
+ Sequence="SegmentedPropertyCategoryCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro" BaselineContextID="7150"
+ SequenceEnd
+ Sequence="SegmentedPropertyTypeCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro" BaselineContextID="7151"
+ SequenceEnd
Name="SurfaceProcessing" Type="2" StringEnumValues="YesNoFull"
Name="SurfaceProcessingRatio" Type="2C" Condition="SurfaceProcessingIsYes"
Name="SurfaceProcessingDescription" Type="3"
@@ -2411,6 +2440,9 @@ Module="SpatialFiducials"
SequenceEnd
Sequence="FiducialSequence" Type="1" VM="1-n"
Name="FiducialIdentifier" Type="1"
+ Sequence="FiducialsPropertyCategoryCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
Sequence="FiducialIdentifierCodeSequence" Type="1C" VM="1" Condition="FiducialIdentifierNotPresent"
InvokeMacro="CodeSequenceMacro"
SequenceEnd
@@ -2457,6 +2489,9 @@ Module="EncapsulatedDocument"
Name="RecognizableVisualFeatures" Type="3" StringEnumValues="YesNoFull"
Sequence="SourceInstanceSequence" Type="1C" VM="1-n" NoCondition=""
InvokeMacro="SOPInstanceReferenceMacro"
+ Sequence="PurposeOfReferenceCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
SequenceEnd
Name="DocumentTitle" Type="2"
Sequence="ConceptNameCodeSequence" Type="2" VM="0-1"
@@ -2664,8 +2699,9 @@ Module="ParametricMapImage"
Verify="ImageType" ValueSelector="0" StringEnumValues="ParametricMapImageAndFrameType1"
Verify="ImageType" ValueSelector="1" StringEnumValues="CommonEnhancedImageAndFrameType2"
Verify="ImageType" ValueSelector="2" StringDefinedTerms="CommonEnhancedImageAndFrameType3"
- Verify="ImageType" ValueSelector="3" StringDefinedTerms="CommonEnhancedFrameType4"
+ Verify="ImageType" ValueSelector="3" StringDefinedTerms="EnhancedMRImageType4"
InvokeMacro="ContentIdentificationMacro"
+ Name="PixelPresentation" Type="3" StringEnumValues="ParametricMapImagePixelPresentation"
Name="SamplesPerPixel" Type="1" BinaryEnumValues="One"
Name="PhotometricInterpretation" Type="1" StringEnumValues="PhotometricInterpretationMonochrome2"
Name="BitsAllocated" Type="1"
@@ -2682,6 +2718,9 @@ Module="ParametricMapImage"
Name="BurnedInAnnotation" Type="1" StringEnumValues="NoFull"
Name="RecognizableVisualFeatures" Type="1" StringEnumValues="YesNoFull"
Name="ContentQualification" Type="1" StringEnumValues="ContentQualification"
+ Name="PaletteColorLookupTableUID" Type="1C" Condition="PixelPresentationIsColorRangeAndPaletteColorLookupTableModuleAbsent"
+ Name="ICCProfile" Type="1C" Condition="PixelPresentationIsColorRange"
+ Name="ColorSpace" Type="3"
ModuleEnd
Module="MultiFrameFunctionalGroupsForParametricMap"
@@ -2699,6 +2738,7 @@ Module="MultiFrameFunctionalGroupsForParametricMap"
InvokeMacro="ContrastBolusUsageMacro" Condition="NeedContrastBolusUsageMacroInSharedFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInSharedFunctionalGroupSequence"
InvokeMacro="ParametricMapFrameTypeMacro" Condition="ParametricMapFrameTypeSequenceNotInPerFrameFunctionalGroupSequence"
+ InvokeMacro="StoredValueColorRangeMacro" Condition="StoredValueColorRangeSequenceNotInPerFrameFunctionalGroupSequenceAndPixelPresentationIsColorRange"
SequenceEnd
Sequence="PerFrameFunctionalGroupsSequence" Type="1" VM="1-n"
InvokeMacro="PixelMeasuresMacro" Condition="PixelMeasuresSequenceNotInSharedFunctionalGroupSequence"
@@ -2715,6 +2755,7 @@ Module="MultiFrameFunctionalGroupsForParametricMap"
InvokeMacro="ContrastBolusUsageMacro" Condition="NeedContrastBolusUsageMacroInPerFrameFunctionalGroupSequence"
InvokeMacro="RespiratorySynchronizationMacro" Condition="RespiratorySynchronizationMacroOKInPerFrameFunctionalGroupSequence"
InvokeMacro="ParametricMapFrameTypeMacro" Condition="ParametricMapFrameTypeSequenceNotInSharedFunctionalGroupSequence"
+ InvokeMacro="StoredValueColorRangeMacro" Condition="StoredValueColorRangeSequenceeNotInSharedFunctionalGroupSequenceAndPixelPresentationIsColorRange"
SequenceEnd
ModuleEnd
@@ -2724,8 +2765,14 @@ DefineMacro="ParametricMapFrameTypeMacro" InformationEntity="FunctionalGroup"
Verify="FrameType" ValueSelector="0" StringEnumValues="ParametricMapImageAndFrameType1"
Verify="FrameType" ValueSelector="1" StringEnumValues="CommonEnhancedImageAndFrameType2"
Verify="FrameType" ValueSelector="2" StringDefinedTerms="CommonEnhancedImageAndFrameType3"
- Verify="FrameType" ValueSelector="3" StringDefinedTerms="CommonEnhancedFrameType4"
+ Verify="FrameType" ValueSelector="3" StringDefinedTerms="EnhancedMRFrameType4"
SequenceEnd
MacroEnd
+DefineMacro="StoredValueColorRangeMacro" InformationEntity="FunctionalGroup"
+ Sequence="StoredValueColorRangeSequence" Type="1" VM="1"
+ Name="MinimumStoredValueMapped" Type="1" VM="1"
+ Name="MaximumStoredValueMapped" Type="1" VM="1"
+ SequenceEnd
+MacroEnd
diff --git a/libsrc/standard/module/dx.tpl b/libsrc/standard/module/dx.tpl
index bfc414a..0fc394d 100755
--- a/libsrc/standard/module/dx.tpl
+++ b/libsrc/standard/module/dx.tpl
@@ -314,6 +314,7 @@ Module="IHEDBTProfile"
Name="OrganDose" Type="1"
Name="EntranceDoseInmGy" Type="1"
SequenceEnd
+ Verify="ImageType" Condition="ImageTypeValuesNotDBTThinThickGenerated2D" ThenErrorMessage="Values not those required for thin or thick slices or generated 2D image by IHE DBT Rad TF Vol 2 Table 4.8.4.1.2.7-1"
ModuleEnd
Module="IHEMammoProfile"
diff --git a/libsrc/standard/module/mr.tpl b/libsrc/standard/module/mr.tpl
index aebec62..0bcbe4d 100755
--- a/libsrc/standard/module/mr.tpl
+++ b/libsrc/standard/module/mr.tpl
@@ -515,6 +515,12 @@ Module="RawData"
Name="ContentDate" Type="1"
Name="ContentTime" Type="1"
Name="AcquisitionDateTime" Type="3"
+ Name="ContentLabel" Type="3"
+ Name="ContentDescription" Type="3"
+ Sequence="ConceptNameCodeSequence" Type="3" VM="1"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
+
Name="CreatorVersionUID" Type="1"
Sequence="ReferencedInstanceSequence" Type="3" VM="1-n"
InvokeMacro="ImageSOPInstanceReferenceMacro"
diff --git a/libsrc/standard/module/rt.tpl b/libsrc/standard/module/rt.tpl
index fcea560..0478e6d 100755
--- a/libsrc/standard/module/rt.tpl
+++ b/libsrc/standard/module/rt.tpl
@@ -283,6 +283,9 @@ Module="RTROIObservations"
SequenceEnd
Sequence="RTROIIdentificationCodeSequence" Type="3" VM="1"
InvokeMacro="CodeSequenceMacro"
+ Sequence="SegmentedPropertyTypeModifierCodeSequence" Type="3" VM="1-n"
+ InvokeMacro="CodeSequenceMacro" BaselineContextID="244"
+ SequenceEnd
SequenceEnd
Sequence="RelatedRTROIObservationsSequence" Type="3" VM="1-n"
Name="ObservationNumber" Type="1"
@@ -935,6 +938,7 @@ Module="RTBeamsSessionRecord"
Name="OverrideParameterPointer" Type="2"
Name="ParameterSequencePointer" Type="3"
Name="ParameterItemIndex" Type="3"
+ Name="ParameterValueNumber" Type="3"
Name="OperatorsName" Type="2"
Sequence="OperatorIdentificationSequence" Type="3" VM="1"
InvokeMacro="PersonIdentificationMacro"
@@ -1461,6 +1465,7 @@ Module="RTIonBeamsSessionRecord"
Name="NumberOfScanSpotPositions" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="ScanSpotPositionMap" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="ScanSpotMetersetsDelivered" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
+ Name="ScanSpotTimeOffset" Type="3"
Name="ScanningSpotSize" Type="3"
Name="NumberOfPaintings" Type="1C" Condition="ScanModeAboveIsModulatedOrModulatedSpec"
Name="PatientSupportAngle" Type="1C" NoCondition=""
@@ -1484,6 +1489,7 @@ Module="RTIonBeamsSessionRecord"
Name="ParameterSequencePointer" Type="1"
Name="OverrideParameterPointer" Type="1"
Name="ParameterItemIndex" Type="1"
+ Name="ParameterValueNumber" Type="3"
Name="OperatorsName" Type="2"
Sequence="OperatorIdentificationSequence" Type="3" VM="1"
InvokeMacro="PersonIdentificationMacro"
diff --git a/libsrc/standard/module/sr.tpl b/libsrc/standard/module/sr.tpl
index e675a9e..b28699a 100755
--- a/libsrc/standard/module/sr.tpl
+++ b/libsrc/standard/module/sr.tpl
@@ -4,7 +4,14 @@ DefineMacro="HierarchicalSOPInstanceReferenceMacro"
InvokeMacro="HierarchicalSeriesReferenceMacro"
SequenceEnd
MacroEnd
-
+
+DefineMacro="HierarchicalSOPInstanceReferenceIHEXDSIManifestProfileMacro"
+ Name="StudyInstanceUID" Type="1"
+ Sequence="ReferencedSeriesSequence" Type="1" VM="1-n"
+ InvokeMacro="HierarchicalSeriesReferenceIHEXDSIManifestProfileMacro"
+ SequenceEnd
+MacroEnd
+
DefineMacro="HierarchicalSeriesReferenceMacro"
Name="SeriesInstanceUID" Type="1"
Name="RetrieveAETitle" Type="3"
@@ -29,6 +36,30 @@ DefineMacro="HierarchicalSeriesReferenceMacro"
SequenceEnd
MacroEnd
+DefineMacro="HierarchicalSeriesReferenceIHEXDSIManifestProfileMacro"
+ Name="SeriesInstanceUID" Type="1"
+ Name="RetrieveAETitle" Type="1"
+ Name="RetrieveLocationUID" Type="1"
+ Name="StorageMediaFileSetID" Type="3"
+ Name="StorageMediaFileSetUID" Type="3"
+ Sequence="ReferencedSOPSequence" Type="1" VM="1-n"
+ InvokeMacro="SOPInstanceReferenceMacro"
+ Sequence="PurposeOfReferenceCodeSequence" Type="3" VM="1-n"
+ InvokeMacro="CodeSequenceMacro"
+ SequenceEnd
+ Sequence="ReferencedDigitalSignatureSequence" Type="3" VM="1-n"
+ Name="DigitalSignatureUID" Type="1"
+ Name="Signature" Type="1"
+ SequenceEnd
+ Sequence="ReferencedSOPInstanceMACSequence" Type="3" VM="1"
+ Name="MACCalculationTransferSyntaxUID" Type="1"
+ Name="MACAlgorithm" Type="1" StringDefinedTerms="MACAlgorithm"
+ Name="DataElementsSigned" Type="1"
+ Name="MAC" Type="1"
+ SequenceEnd
+ SequenceEnd
+MacroEnd
+
DefineMacro="IdentifiedPersonOrDeviceMacro"
Name="ObserverType" Type="1" StringEnumValues="ObserverType"
Name="PersonName" Type="1C" Condition="ObserverTypeIsPerson"
@@ -335,6 +366,12 @@ Module="KeyObjectDocument"
SequenceEnd
ModuleEnd
+Module="IHEXDSIManifestProfile"
+ Sequence="CurrentRequestedProcedureEvidenceSequence" Type="1" VM="1-n"
+ InvokeMacro="HierarchicalSOPInstanceReferenceIHEXDSIManifestProfileMacro"
+ SequenceEnd
+ModuleEnd
+
Module="IHEREMProfile"
Name="SeriesDescription" Type="1"
Sequence="ReferencedPerformedProcedureStepSequence" Type="1" VM="1"
diff --git a/libsrc/standard/strval/base.tpl b/libsrc/standard/strval/base.tpl
index a435828..64fc11c 100755
--- a/libsrc/standard/strval/base.tpl
+++ b/libsrc/standard/strval/base.tpl
@@ -908,6 +908,12 @@ StringValues="PhotometricInterpretationRGBorYBR_RCT" {
RGB
}
+StringValues="PhotometricInterpretationYBRFullOrRGBorYBR_RCT" {
+ YBR_FULL,
+ YBR_RCT,
+ RGB
+}
+
StringValues="ImageType1" {
ORIGINAL,
DERIVED
@@ -1544,4 +1550,9 @@ StringValues="QueryRetrieveView" {
ENHANCED
}
+StringValues="ParametricMapImagePixelPresentation" {
+ COLOR_RANGE,
+ MONOCHROME
+}
+
diff --git a/libsrc/standard/strval/pet.tpl b/libsrc/standard/strval/pet.tpl
index 81460fd..ab123ec 100755
--- a/libsrc/standard/strval/pet.tpl
+++ b/libsrc/standard/strval/pet.tpl
@@ -23,6 +23,8 @@ StringValues="SUVType" {
BSA,
BW,
LBM,
+ LBMJAMES128,
+ LBMJANMA,
IBW
}
--
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