[med-svn] [dicom3tools] 01/04: Imported Upstream version 1.00~20160610072711
Gert Wollny
gert-guest at moszumanska.debian.org
Wed Jun 22 10:26:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository dicom3tools.
commit 89f2f5d29c6c4da08c27f416de7a0b8c6d180893
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Tue Jun 21 16:34:38 2016 +0000
Imported Upstream version 1.00~20160610072711
---
CHANGES | 10 ++++++++++
VERSION | 2 +-
libsrc/src/generic/platform.cc | 2 +-
libsrc/src/generic/version.cc | 2 +-
libsrc/standard/elmdict/dicom3.tpl | 12 +++++++++---
libsrc/standard/module/base.tpl | 33 +++++++++++++++++++++++++--------
libsrc/standard/module/ct.tpl | 2 +-
libsrc/standard/module/dx.tpl | 4 ++--
libsrc/standard/module/mr.tpl | 2 +-
libsrc/standard/module/pet.tpl | 2 +-
libsrc/standard/module/us.tpl | 2 +-
libsrc/standard/module/vl.tpl | 6 +++---
libsrc/standard/module/xaxrf.tpl | 4 ++--
libsrc/standard/strval/base.tpl | 10 +++++++++-
14 files changed, 67 insertions(+), 26 deletions(-)
diff --git a/CHANGES b/CHANGES
index 752bb44..6beae1d 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+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)
+
+160529: libsrc/standard/module/base.tpl,ct.tpl,dx.tpl,mr.tpl,pet.tpl,us.tpl,vl.tpl,xaxrf.tpl: Report error if Lossy Image Compression Ratio is zero (000493)
+
+160525: libsrc/standard/elmdict/dicom3.tpl: Add data elements for Equivalent Scope Code (CP 1539)
+
+160525: libsrc/standard/elmdict/dicom3.tpl: Add data elements for RT Ion Beams Scan Spot Ordering (CP 1013)
+
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
diff --git a/VERSION b/VERSION
index 388d9cb..6e5891b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.snapshot.20160516104835
+1.00.snapshot.20160610072711
diff --git a/libsrc/src/generic/platform.cc b/libsrc/src/generic/platform.cc
index 0b11f25..0ce8cb7 100644
--- a/libsrc/src/generic/platform.cc
+++ b/libsrc/src/generic/platform.cc
@@ -4,4 +4,4 @@
#include "platform.h"
-const char* dicom3tools_platform_string = "Darwin graytoo.local 14.5.0 Darwin Kernel Version 14.5.0: Tue Sep 1 21:23:09 PDT 2015; root:xnu-2782.50.1~1/RELEASE_X86_64 x86_64";
+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";
diff --git a/libsrc/src/generic/version.cc b/libsrc/src/generic/version.cc
index 262a001..d6ddbb9 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.20160516104835";
+const char* dicom3tools_version_string = "1.00.snapshot.20160610072711";
diff --git a/libsrc/standard/elmdict/dicom3.tpl b/libsrc/standard/elmdict/dicom3.tpl
index 58eeeae..c8ba9fa 100644
--- a/libsrc/standard/elmdict/dicom3.tpl
+++ b/libsrc/standard/elmdict/dicom3.tpl
@@ -151,6 +151,9 @@
(0008,0119) VERS="3" VR="UC" VM="1" Keyword="LongCodeValue" Name="Long Code Value"
(0008,0120) VERS="3" VR="UR" VM="1" Keyword="URNCodeValue" Name="URN Code Value"
(0008,0121) VERS="3" VR="SQ" VM="1" Keyword="EquivalentCodeSequence" Name="Equivalent Code Sequence"
+(0008,0122) VERS="3" VR="LO" VM="1" Keyword="MappingResourceName" Name="Mapping Resource Name"
+(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,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"
@@ -3651,11 +3654,14 @@
(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,0390) VERS="3" VR="SH" VM="1" Keyword="ScanSpotTuneID" Name="Scan Spot Tune ID"
+(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"
-(300A,0394) VERS="3" VR="FL" VM="1-n" Keyword="ScanSpotPositionMap" Name="Scan Spot Position Map"
+(300A,0393) VERS="3" VR="CS" VM="1" Keyword="ScanSpotReordered" Name="Scan Spot Reordered"
+(300A,0394) VERS="3" VR="FL" VM="1-n" Keyword="ScanSpotPositionMap" Name="Scan Spot Position Map"
+(300A,0395) VERS="3" VR="CS" VM="1" Keyword="ScanSpotReorderingAllowed" Name="Scan Spot Reordering Allowed"
(300A,0396) VERS="3" VR="FL" VM="1-n" Keyword="ScanSpotMetersetWeights" Name="Scan Spot Meterset Weights"
-(300A,0398) VERS="3" VR="FL" VM="2" Keyword="ScanningSpotSize" Name="Scanning Spot Size"
+(300A,0398) VERS="3" VR="FL" VM="2" Keyword="ScanningSpotSize" Name="Scanning Spot Size"
(300A,039A) VERS="3" VR="IS" VM="1" Keyword="NumberOfPaintings" Name="Number of Paintings"
(300A,03A0) VERS="3" VR="SQ" VM="1" Keyword="IonToleranceTableSequence" Name="Ion Tolerance Table Sequence"
(300A,03A2) VERS="3" VR="SQ" VM="1" Keyword="IonBeamSequence" Name="Ion Beam Sequence"
diff --git a/libsrc/standard/module/base.tpl b/libsrc/standard/module/base.tpl
index 400f2a2..9cb7f1c 100755
--- a/libsrc/standard/module/base.tpl
+++ b/libsrc/standard/module/base.tpl
@@ -38,21 +38,27 @@ DefineMacro="BasicCodeSequenceMacro"
Name="URNCodeValue" Type="1C" Condition="CodeValueAndLongCodeValueAbsent"
MacroEnd
-DefineMacro="CodeSequenceMacro"
- InvokeMacro="BasicCodeSequenceMacro"
- Sequence="EquivalentCodeSequence" Type="3" VM="1-n"
- InvokeMacro="BasicCodeSequenceMacro"
- SequenceEnd
+DefineMacro="EnhancedCodeSequenceMacro"
Name="ContextIdentifier" Type="3"
Name="ContextUID" Type="3"
- Name="MappingResource" Type="1C" Condition="ContextIdentifierIsPresent"
+ Name="MappingResource" Type="1C" Condition="ContextIdentifierIsPresent" StringDefinedTerms="MappingResources"
Name="MappingResourceUID" Type="3" StringDefinedTerms="MappingResourceUIDs"
+ Name="MappingResourceName" Type="3" StringDefinedTerms="MappingResourceNames"
Name="ContextGroupVersion" Type="1C" Condition="ContextIdentifierIsPresent"
Name="ContextGroupExtensionFlag" Type="3" StringEnumValues="YesNoLetter"
Name="ContextGroupLocalVersion" Type="1C" Condition="ExtendedCodingScheme"
Name="ContextGroupExtensionCreatorUID" Type="1C" Condition="ExtendedCodingScheme"
MacroEnd
+DefineMacro="CodeSequenceMacro"
+ InvokeMacro="BasicCodeSequenceMacro"
+ Sequence="EquivalentCodeSequence" Type="3" VM="1-n"
+ InvokeMacro="BasicCodeSequenceMacro"
+ InvokeMacro="EnhancedCodeSequenceMacro"
+ SequenceEnd
+ InvokeMacro="EnhancedCodeSequenceMacro"
+MacroEnd
+
DefineMacro="CodeSequenceMeaningOptionalMacro"
Name="CodeValue" Type="1"
Verify="CodeValue" Condition="CodeValueIllegalOrDeprecated" ThenErrorMessage="Code Value is illegal or deprecated" ShowValueWithMessage="true"
@@ -346,7 +352,7 @@ DefineMacro="ContributingImageSourcesMacro" InformationEntity="Instance"
Name="Columns" Type="1" NotZeroError=""
Name="BitsStored" Type="1" NotZeroError=""
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
MacroEnd
@@ -2006,6 +2012,17 @@ Module="SOPCommon"
Name="CodingSchemeVersion" Type="3"
Name="CodingSchemeResponsibleOrganization" Type="3"
SequenceEnd
+ Sequence="ContextGroupIdentificationSequence" Type="3" VM="1-n"
+ Name="ContextIdentifier" Type="1"
+ Name="ContextUID" Type="3"
+ Name="MappingResource" Type="1" StringDefinedTerms="MappingResources"
+ Name="ContextGroupVersion" Type="1"
+ SequenceEnd
+ Sequence="MappingResourceIdentificationSequence" Type="3" VM="1-n"
+ Name="MappingResource" Type="1" StringDefinedTerms="MappingResources"
+ Name="MappingResourceUID" Type="3" StringDefinedTerms="MappingResourceUIDs"
+ Name="MappingResourceName" Type="3" StringDefinedTerms="MappingResourceNames"
+ SequenceEnd
Name="TimezoneOffsetFromUTC" Type="3"
Sequence="ContributingEquipmentSequence" Type="3" VM="1-n"
Sequence="PurposeOfReferenceCodeSequence" Type="1" VM="1"
@@ -2192,7 +2209,7 @@ DefineMacro="SegmentDescriptionMacro" InformationEntity="Instance"
SequenceEnd
Sequence="SegmentedPropertyTypeCodeSequence" Type="1" VM="1"
InvokeMacro="CodeSequenceMacro" BaselineContextID="7151"
- Sequence="SegmentedPropertyTypeModifierCodeSequence" Type="3" VM="1"
+ Sequence="SegmentedPropertyTypeModifierCodeSequence" Type="3" VM="1-n"
InvokeMacro="CodeSequenceMacro" BaselineContextID="244"
SequenceEnd
SequenceEnd
diff --git a/libsrc/standard/module/ct.tpl b/libsrc/standard/module/ct.tpl
index fbb3336..107cf02 100644
--- a/libsrc/standard/module/ct.tpl
+++ b/libsrc/standard/module/ct.tpl
@@ -50,7 +50,7 @@ Module="EnhancedCTImage"
Name="BurnedInAnnotation" Type="1C" StringEnumValues="NoFull" Condition="NotLegacyConvertedCT" mbpo="true"
Name="RecognizableVisualFeatures" Type="3" StringEnumValues="YesNoFull"
Name="LossyImageCompression" Type="1C" StringEnumValues="LossyImageCompression" Condition="NotLegacyConvertedCT" mbpo="true"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="PresentationLUTShape" Type="1" StringEnumValues="IdentityPresentationLUTShape"
diff --git a/libsrc/standard/module/dx.tpl b/libsrc/standard/module/dx.tpl
index 8904117..bfc414a 100755
--- a/libsrc/standard/module/dx.tpl
+++ b/libsrc/standard/module/dx.tpl
@@ -119,7 +119,7 @@ Module="DXImage"
Name="RescaleType" Type="1" StringEnumValues="ModalityLUTTypeUnspecified"
Name="PresentationLUTShape" Type="1" StringEnumValues="DXPresentationLUTShape"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" NoCondition=""
+ Name="LossyImageCompressionRatio" Type="1C" NoCondition="" NotZeroError=""
Name="DerivationDescription" Type="3"
Name="AcquisitionDeviceProcessingDescription" Type="3"
Name="AcquisitionDeviceProcessingCode" Type="3"
@@ -541,7 +541,7 @@ Module="EnhancedMammographyImage"
Name="QualityControlImage" Type="3" StringEnumValues="YesNoFull"
Name="BurnedInAnnotation" Type="1" StringEnumValues="NoFull"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="OrganDose" Type="1"
diff --git a/libsrc/standard/module/mr.tpl b/libsrc/standard/module/mr.tpl
index 18ed548..aebec62 100755
--- a/libsrc/standard/module/mr.tpl
+++ b/libsrc/standard/module/mr.tpl
@@ -418,7 +418,7 @@ Module="EnhancedMRImage"
Name="BurnedInAnnotation" Type="1C" Condition="NotLegacyConvertedMR" StringEnumValues="NoFull" mbpo="true"
Name="RecognizableVisualFeatures" Type="3" StringEnumValues="YesNoFull"
Name="LossyImageCompression" Type="1C" Condition="NotLegacyConvertedMR" StringEnumValues="LossyImageCompression" mbpo="true"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="PresentationLUTShape" Type="1" StringEnumValues="IdentityPresentationLUTShape"
diff --git a/libsrc/standard/module/pet.tpl b/libsrc/standard/module/pet.tpl
index d1103d9..b622958 100755
--- a/libsrc/standard/module/pet.tpl
+++ b/libsrc/standard/module/pet.tpl
@@ -408,7 +408,7 @@ Module="EnhancedPETImage"
Name="BurnedInAnnotation" Type="1C" StringEnumValues="NoFull" Condition="NotLegacyConvertedPET" mbpo="true"
Name="RecognizableVisualFeatures" Type="3" StringEnumValues="YesNoFull"
Name="LossyImageCompression" Type="1C" StringEnumValues="LossyImageCompression" Condition="NotLegacyConvertedPET" mbpo="true"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="PresentationLUTShape" Type="1" StringEnumValues="IdentityPresentationLUTShape"
diff --git a/libsrc/standard/module/us.tpl b/libsrc/standard/module/us.tpl
index 041a1b5..f8ed645 100644
--- a/libsrc/standard/module/us.tpl
+++ b/libsrc/standard/module/us.tpl
@@ -111,7 +111,7 @@ Module="EnhancedUSImage"
Name="AcquisitionDuration" Type="1"
Name="PositionMeasuringDeviceUsed" Type="1C" Condition="NeedPositionMeasuringDeviceUsed" StringEnumValues="PositionMeasuringDeviceUsed" mbpo="true"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="PresentationLUTShape" Type="1" StringEnumValues="IdentityPresentationLUTShape"
diff --git a/libsrc/standard/module/vl.tpl b/libsrc/standard/module/vl.tpl
index 09d8527..5b2872b 100755
--- a/libsrc/standard/module/vl.tpl
+++ b/libsrc/standard/module/vl.tpl
@@ -100,7 +100,7 @@ Module="OphthalmicPhotographyImage"
SequenceEnd
SequenceEnd
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="PresentationLUTShape" Type="1C" Condition="PhotometricInterpretationIsMonochrome2" StringEnumValues="IdentityPresentationLUTShape"
@@ -216,7 +216,7 @@ Module="OphthalmicTomographyImage"
Name="HighBit" Type="1" BinaryEnumValues="BitsAre7Or11Or15"
Name="PresentationLUTShape" Type="1" StringEnumValues="IdentityPresentationLUTShape"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="BurnedInAnnotation" Type="1" StringEnumValues="NoFull"
@@ -332,7 +332,7 @@ Module="WholeSlideMicroscopyImage"
Name="AcquisitionDateTime" Type="1"
Name="AcquisitionDuration" Type="1"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Name="PresentationLUTShape" Type="1C" Condition="PhotometricInterpretationIsMonochrome2" StringEnumValues="IdentityPresentationLUTShape"
diff --git a/libsrc/standard/module/xaxrf.tpl b/libsrc/standard/module/xaxrf.tpl
index d29f405..5a2310f 100755
--- a/libsrc/standard/module/xaxrf.tpl
+++ b/libsrc/standard/module/xaxrf.tpl
@@ -216,7 +216,7 @@ Module="EnhancedXAXRFImage"
Name="BurnedInAnnotation" Type="1" StringEnumValues="NoFull"
Name="RecognizableVisualFeatures" Type="3" StringEnumValues="YesNoFull"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Sequence="ReferencedOtherPlaneSequence" Type="1C" VM="1" Condition="ImageTypeValue3BiplaneAOrB"
@@ -638,7 +638,7 @@ Module="XRay3DImage"
Name="BurnedInAnnotation" Type="1" StringEnumValues="NoFull"
Name="RecognizableVisualFeatures" Type="3" StringEnumValues="YesNoFull"
Name="LossyImageCompression" Type="1" StringEnumValues="LossyImageCompression"
- Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01"
+ Name="LossyImageCompressionRatio" Type="1C" Condition="LossyImageCompressionIs01" NotZeroError=""
Name="LossyImageCompressionMethod" Type="1C" StringDefinedTerms="LossyImageCompressionMethod" Condition="LossyImageCompressionIs01"
Verify="LossyImageCompressionMethod" Condition="LossyImageCompressionMethodInconsistentWithTransferSyntax" ThenWarningMessage="method inconsistent with transfer syntax" ShowValueWithMessage="true"
Sequence="ReferencedImageEvidenceSequence" Type="1C" VM="1-n" Condition="ReferencedImageSequenceIsPresentInFunctionalGroups"
diff --git a/libsrc/standard/strval/base.tpl b/libsrc/standard/strval/base.tpl
index 0b8ad62..681b962 100755
--- a/libsrc/standard/strval/base.tpl
+++ b/libsrc/standard/strval/base.tpl
@@ -1525,8 +1525,16 @@ StringValues="ParametricMapImageAndFrameType1" {
DERIVED
}
+StringValues="MappingResources" {
+ DCMR
+}
+
StringValues="MappingResourceUIDs" {
- DERIVED
+ 1.2.840.10008.8.1.1
+}
+
+StringValues="MappingResourceNames" {
+ DICOM Content Mapping Resource
}
StringValues="QueryRetrieveView" {
--
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