[med-svn] [dicom3tools] 01/04: Imported Upstream version 1.00~20160721064406

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository dicom3tools.

commit 3c06e7b7032155e5d529303f30f13c20a6b673b1
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Aug 24 07:25:03 2016 +0000

    Imported Upstream version 1.00~20160721064406
---
 CHANGES                         | 4 ++++
 VERSION                         | 2 +-
 libsrc/src/generic/platform.cc  | 2 +-
 libsrc/src/generic/version.cc   | 2 +-
 libsrc/standard/condn.tpl       | 6 ++++++
 libsrc/standard/strval/base.tpl | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6beae1d..75c14e6 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+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)
+
 160610:	libsrc/standard/module,strval/base.tpl: Factor out Enhanced Code Sequence Macro and use in Equivalent Code Sequence and add Context Group and Mapping Resource Identification Sequences to SOP Common (CP 1539), and correct MappingResourceUID defined terms for DCMR
 
 160610:	libsrc/standard/module/base.tpl: Allow more than one item in SegmentedPropertyTypeModifierCodeSequence (000494)
diff --git a/VERSION b/VERSION
index 6e5891b..a1f2d7c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.snapshot.20160610072711
+1.00.snapshot.20160721064406
diff --git a/libsrc/src/generic/platform.cc b/libsrc/src/generic/platform.cc
index 0ce8cb7..7cb43f0 100644
--- a/libsrc/src/generic/platform.cc
+++ b/libsrc/src/generic/platform.cc
@@ -4,4 +4,4 @@
 
 #include "platform.h"
 
-const char* dicom3tools_platform_string = "Darwin graytoo.local 14.5.0 Darwin Kernel Version 14.5.0: Mon Jan 11 18:48:35 PST 2016; root:xnu-2782.50.2~1/RELEASE_X86_64 x86_64";
+const char* dicom3tools_platform_string = "Darwin graytoo.local 14.5.0 Darwin Kernel Version 14.5.0: Thu Apr 21 20:40:54 PDT 2016; root:xnu-2782.50.3~1/RELEASE_X86_64 x86_64";
diff --git a/libsrc/src/generic/version.cc b/libsrc/src/generic/version.cc
index d6ddbb9..a34f926 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.20160610072711";
+const char* dicom3tools_version_string = "1.00.snapshot.20160721064406";
diff --git a/libsrc/standard/condn.tpl b/libsrc/standard/condn.tpl
index a6b94ad..08a5157 100755
--- a/libsrc/standard/condn.tpl
+++ b/libsrc/standard/condn.tpl
@@ -917,13 +917,19 @@ ConditionEnd
 Condition="PatientOrientationRequired"
 	# General Image Module: "Required if image does not require Image Orientation (Patient) (0020,0037) and Image Position (Patient) (0020,0032)."
 	Element="SOPClassUID"			               Modifier="Not" StringConstantFromRootAttribute="EnhancedMRImageStorageSOPClassUID"
+	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="EnhancedMRColorImageStorageSOPClassUID"
+	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedMRImageStorageSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="MRSpectroscopyStorageSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="MRImageStorageSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="CTImageStorageSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="EnhancedCTImageStorageSOPClassUID"
+	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedCTImageStorageSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="NuclearMedicineImageStorageSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="NuclearMedicineImageStorageRetiredSOPClassUID"
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="PETImageStorageSOPClassUID"
+	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="EnhancedPETImageStorageSOPClassUID"
+	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="LegacyConvertedEnhancedPETImageStorageSOPClassUID"
+	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="ParametricMapStorageSOPClassUID"
 	# not required for RT dose, since either needed for grid (image) or not an image hence not applicable
 	Element="SOPClassUID"			Operator="And" Modifier="Not" StringConstantFromRootAttribute="RTDoseStorageSOPClassUID"
 	(
diff --git a/libsrc/standard/strval/base.tpl b/libsrc/standard/strval/base.tpl
index 681b962..a435828 100755
--- a/libsrc/standard/strval/base.tpl
+++ b/libsrc/standard/strval/base.tpl
@@ -306,6 +306,7 @@ StringValues="MiscellaneousCodingSchemeDesignators"	{
 	I10P = ICD10 Procedure Coding System,
 	IBT = ISBT,
 	ICS = ICCS,
+	IETF4646 = IETF RFC 4646 language codes,
 	ISO3166_1 = ISO 2 letter country codes,
 	ISO639_1 = ISO 2 letter language codes,
 	ISO639_2 = ISO 3 letter language codes,
@@ -336,6 +337,7 @@ StringValues="MiscellaneousCodingSchemeDesignators"	{
 	RADLEX = RadLex,
 	RC  = Read Clinical Classification of Medicine,
 	RFC3066 = IETF RFC 3066 language codes,
+	RFC5646 = IETF RFC 5646 language codes,
 	SCPECG = Standard Communications Protocol for Computer-Assisted Electrocardiography,
 	SNM3 = SNOMED International Version 3,
 	SCT = SNOMED-CT,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicom3tools.git