[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 2de87d48325b79f26f183c9bf3a9a37f4a
Cross-platform DICOM implementation
Brought to you by:
malat
Menu
▾
▴
[Gdcm-hackers] gdcm-git:Grassroots DICOM branch release updated. 2de87d48325b79f26f183c9bf3a9a37f4a3c9319
|
From: Mathieu M. <ma...@us...> - 2022-09-12 09:33:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".
The branch, release has been updated
via 2de87d48325b79f26f183c9bf3a9a37f4a3c9319 (commit)
via 63d1d6256cf02e3793079b529baa156697049504 (commit)
from 639257c3062fde59761424337dbaf8f55237c18b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/2de87d48325b79f26f183c9bf3a9a37f4a3c9319/
commit 2de87d48325b79f26f183c9bf3a9a37f4a3c9319
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Sep 9 08:47:59 2022 -0700
fix some name
diff --git a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
index b025bac94..1a5787506 100644
--- a/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
+++ b/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx
@@ -3160,66 +3160,68 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0021,0x0070,"FDMS 1.0",VR::IS,VM::VM1,"Film Number within the Series",false },
{0x0021,0x0080,"FDMS 1.0",VR::OB,VM::VM1,"Equipment Type-Specific Information",false },
{0x0021,0x0090,"FDMS 1.0",VR::CS,VM::VM1,"LUT Number",false },
- {0x0023,0x0010,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0023,0x0020,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0023,0x0030,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
+ {0x0023,0x0010,"FDMS 1.0",VR::SQ,VM::VM1,"Left-image Processing Parameter Sequence",false },
+ {0x0023,0x0020,"FDMS 1.0",VR::SQ,VM::VM1,"Right-image Processing Parameter Sequence",false },
+ {0x0023,0x0030,"FDMS 1.0",VR::SQ,VM::VM1,"Single-image Processing Parameter Sequence",false },
{0x0025,0x0010,"FDMS 1.0",VR::US,VM::VM1,"Relative Light Emission Amount Sk",false },
{0x0025,0x0011,"FDMS 1.0",VR::US,VM::VM1,"Term of Correction for Each IP Type St",false },
{0x0025,0x0012,"FDMS 1.0",VR::US,VM::VM1,"Reading Gain Gp",false },
- {0x0025,0x0013,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0015,"FDMS 1.0",VR::CS,VM::VM1,"?",false },
- {0x0025,0x0020,"FDMS 1.0",VR::US,VM::VM2,"?",false },
- {0x0025,0x0021,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0030,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0031,"FDMS 1.0",VR::SS,VM::VM1,"?",false },
- {0x0025,0x0032,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0033,"FDMS 1.0",VR::SS,VM::VM1,"?",false },
- {0x0025,0x0034,"FDMS 1.0",VR::SS,VM::VM1,"?",false },
- {0x0025,0x0040,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0041,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0042,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0043,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0050,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0051,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0052,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0053,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0060,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0061,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0062,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0063,"FDMS 1.0",VR::CS,VM::VM1,"?",false },
- {0x0025,0x0070,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0071,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0072,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0073,"FDMS 1.0",VR::US,VM::VM6,"?",false },
- {0x0025,0x0074,"FDMS 1.0",VR::US,VM::VM6,"?",false },
- {0x0025,0x0080,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0081,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0082,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0083,"FDMS 1.0",VR::US,VM::VM6,"?",false },
- {0x0025,0x0084,"FDMS 1.0",VR::US,VM::VM6,"?",false },
- {0x0025,0x0090,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0091,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0092,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0093,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0094,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0095,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x0096,"FDMS 1.0",VR::CS,VM::VM1,"?",false },
- {0x0025,0x00a0,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x00a1,"FDMS 1.0",VR::SS,VM::VM1,"?",false },
- {0x0025,0x00a2,"FDMS 1.0",VR::US,VM::VM1,"?",false },
- {0x0025,0x00a3,"FDMS 1.0",VR::SS,VM::VM1,"?",false },
- {0x0027,0x0010,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0020,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0030,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0040,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0050,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0060,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0070,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x0080,"FDMS 1.0",VR::SQ,VM::VM1,"?",false },
- {0x0027,0x00a0,"FDMS 1.0",VR::IS,VM::VM1,"?",false },
- {0x0027,0x00a1,"FDMS 1.0",VR::CS,VM::VM2,"?",false },
- {0x0027,0x00a2,"FDMS 1.0",VR::CS,VM::VM2,"?",false },
- {0x0027,0x00a3,"FDMS 1.0",VR::SS,VM::VM1_n,"?",false },
+ {0x0025,0x0013,"FDMS 1.0",VR::US,VM::VM1,"Latitude",false },
+ {0x0025,0x0015,"FDMS 1.0",VR::CS,VM::VM1,"Image Processing Selection Flag",false },
+ {0x0025,0x0016,"FDMS 1.0",VR::US,VM::VM1,"Min",false },
+ {0x0025,0x0017,"FDMS 1.0",VR::US,VM::VM1,"Max",false },
+ {0x0025,0x0020,"FDMS 1.0",VR::US,VM::VM2,"Sensitivity Shift (S-SHFT)",false },
+ {0x0025,0x0021,"FDMS 1.0",VR::US,VM::VM1,"Contrast Shift (C-SHIFT)",false },
+ {0x0025,0x0030,"FDMS 1.0",VR::US,VM::VM1,"GT",false },
+ {0x0025,0x0031,"FDMS 1.0",VR::SS,VM::VM1,"GA",false },
+ {0x0025,0x0032,"FDMS 1.0",VR::US,VM::VM1,"GC",false },
+ {0x0025,0x0033,"FDMS 1.0",VR::SS,VM::VM1,"GS",false },
+ {0x0025,0x0034,"FDMS 1.0",VR::SS,VM::VM1,"tan θ",false },
+ {0x0025,0x0040,"FDMS 1.0",VR::US,VM::VM1,"RT",false },
+ {0x0025,0x0041,"FDMS 1.0",VR::US,VM::VM1,"RN",false },
+ {0x0025,0x0042,"FDMS 1.0",VR::US,VM::VM1,"RE",false },
+ {0x0025,0x0043,"FDMS 1.0",VR::US,VM::VM1,"N",false },
+ {0x0025,0x0050,"FDMS 1.0",VR::US,VM::VM1,"DRT",false },
+ {0x0025,0x0051,"FDMS 1.0",VR::US,VM::VM1,"DRN",false },
+ {0x0025,0x0052,"FDMS 1.0",VR::US,VM::VM1,"DRE",false },
+ {0x0025,0x0053,"FDMS 1.0",VR::US,VM::VM1,"DN",false },
+ {0x0025,0x0060,"FDMS 1.0",VR::US,VM::VM1,"ORN",false },
+ {0x0025,0x0061,"FDMS 1.0",VR::US,VM::VM1,"ORE",false },
+ {0x0025,0x0062,"FDMS 1.0",VR::US,VM::VM1,"ON",false },
+ {0x0025,0x0063,"FDMS 1.0",VR::CS,VM::VM1,"ORD",false },
+ {0x0025,0x0070,"FDMS 1.0",VR::US,VM::VM1,"MDT",false },
+ {0x0025,0x0071,"FDMS 1.0",VR::US,VM::VM1,"MDB",false },
+ {0x0025,0x0072,"FDMS 1.0",VR::US,VM::VM1,"MDE",false },
+ {0x0025,0x0073,"FDMS 1.0",VR::US,VM::VM1_n,"MFP-DRC Suppression Characteristics Parameters",false },
+ {0x0025,0x0074,"FDMS 1.0",VR::US,VM::VM1_n,"MFP-DRC Frequency Characteristics Parameters",false },
+ {0x0025,0x0080,"FDMS 1.0",VR::US,VM::VM1,"MRT",false },
+ {0x0025,0x0081,"FDMS 1.0",VR::US,VM::VM1,"MRB",false },
+ {0x0025,0x0082,"FDMS 1.0",VR::US,VM::VM1,"MRE",false },
+ {0x0025,0x0083,"FDMS 1.0",VR::US,VM::VM1_n,"MFP-USM Suppression Characteristics Parameters",false },
+ {0x0025,0x0084,"FDMS 1.0",VR::US,VM::VM1_n,"MFP-USM Frequency Characteristics Parameters",false },
+ {0x0025,0x0090,"FDMS 1.0",VR::US,VM::VM1,"PTE (α edge)",false },
+ {0x0025,0x0091,"FDMS 1.0",VR::US,VM::VM1,"PTR (α calc)",false },
+ {0x0025,0x0092,"FDMS 1.0",VR::US,VM::VM1,"PRN",false },
+ {0x0025,0x0093,"FDMS 1.0",VR::US,VM::VM1,"PRE",false },
+ {0x0025,0x0094,"FDMS 1.0",VR::US,VM::VM1,"PEM Sstd",false },
+ {0x0025,0x0095,"FDMS 1.0",VR::US,VM::VM1,"PEM Lstd",false },
+ {0x0025,0x0096,"FDMS 1.0",VR::CS,VM::VM1,"PEM Unsharp Mask Value N",false },
+ {0x0025,0x00a0,"FDMS 1.0",VR::US,VM::VM1,"MFP GT",false },
+ {0x0025,0x00a1,"FDMS 1.0",VR::SS,VM::VM1,"MFP GA",false },
+ {0x0025,0x00a2,"FDMS 1.0",VR::US,VM::VM1,"MFP GC",false },
+ {0x0025,0x00a3,"FDMS 1.0",VR::SS,VM::VM1,"MFP GS",false },
+ {0x0027,0x0010,"FDMS 1.0",VR::SQ,VM::VM1,"γ Raw Data Table Sequence",false },
+ {0x0027,0x0020,"FDMS 1.0",VR::SQ,VM::VM1,"β Raw Data Table Sequence",false },
+ {0x0027,0x0030,"FDMS 1.0",VR::SQ,VM::VM1,"DRC Raw Data Table Sequence",false },
+ {0x0027,0x0040,"FDMS 1.0",VR::SQ,VM::VM1,"MFP-DRC Raw Data Table Sequence",false },
+ {0x0027,0x0050,"FDMS 1.0",VR::SQ,VM::VM1,"MFP-USM Raw Data Table Sequence",false },
+ {0x0027,0x0060,"FDMS 1.0",VR::SQ,VM::VM1,"PEM α Edge Raw Data Table Sequence",false },
+ {0x0027,0x0070,"FDMS 1.0",VR::SQ,VM::VM1,"PEM α Calc Raw Data Table Sequence",false },
+ {0x0027,0x0080,"FDMS 1.0",VR::SQ,VM::VM1,"MFP γ Raw Data Table Sequence",false },
+ {0x0027,0x00a0,"FDMS 1.0",VR::IS,VM::VM1,"No. of Data",false },
+ {0x0027,0x00a1,"FDMS 1.0",VR::CS,VM::VM2,"Data Input Type",false },
+ {0x0027,0x00a2,"FDMS 1.0",VR::CS,VM::VM2,"Data Output Type",false },
+ {0x0027,0x00a3,"FDMS 1.0",VR::US_SS,VM::VM1_n,"Raw Data",false },
{0x0029,0x0020,"FDMS 1.0",VR::CS,VM::VM1,"Image Scanning Direction",false },
{0x0029,0x0025,"FDMS 1.0",VR::CS,VM::VM1,"Image Rotation/Reversal Information",false },
{0x0029,0x0030,"FDMS 1.0",VR::CS,VM::VM1,"Extended Reading Size Value",false },
@@ -4348,17 +4350,26 @@ static const DICT_ENTRY DICOMV3DataDict [] = {
{0x0045,0x001f,"GEMS_HELIOS_01",VR::SS,VM::VM1,"Cross Talk Calibration Date",false },
{0x0045,0x0020,"GEMS_HELIOS_01",VR::SS,VM::VM1,"Cross Talk Calibration Time",false },
{0x0045,0x0021,"GEMS_HELIOS_01",VR::SS,VM::VM1,"Iterbone Flag",false },
- {0x0045,0x0022,"GEMS_HELIOS_01",VR::SS,VM::VM1,"Perisstaltic Flag",false },
+ {0x0045,0x0022,"GEMS_HELIOS_01",VR::SS,VM::VM1,"Peristaltic Flag",false },
{0x0045,0x0030,"GEMS_HELIOS_01",VR::CS,VM::VM1,"CardiacReconAlgorithm",false },
{0x0045,0x0031,"GEMS_HELIOS_01",VR::CS,VM::VM1,"AvgHeartRateForImage",false },
- {0x0045,0x0032,"GEMS_HELIOS_01",VR::FL,VM::VM1,"TemporalResolution",false },
+ {0x0045,0x0032,"GEMS_HELIOS_01",VR::FL,VM::VM1,"Temporal Resolution",false },
{0x0045,0x0033,"GEMS_HELIOS_01",VR::CS,VM::VM1,"PctRpeakDelay",false },
{0x0045,0x0034,"GEMS_HELIOS_01",VR::CS,VM::VM1,"ActualPctRpeakDelay",false },
{0x0045,0x0036,"GEMS_HELIOS_01",VR::CS,VM::VM1,"EkgFullMaStartPhase",false },
{0x0045,0x0037,"GEMS_HELIOS_01",VR::CS,VM::VM1,"EkgFullMaEndPhase",false },
{0x0045,0x0038,"GEMS_HELIOS_01",VR::CS,VM::VM1,"EkgModulationMaxMa",false },
{0x0045,0x0039,"GEMS_HELIOS_01",VR::CS,VM::VM1,"EkgModulationMinMa",false },
- {0x0045,0x003b,"GEMS_HELIOS_01",VR::LO,VM::VM1,"NoiseReductionImageFilterDesc",false },
+ {0x0045,0x003b,"GEMS_HELIOS_01",VR::LO,VM::VM1,"Noise Reduction Image Filter Description",false },
+ {0x0045,0x003f,"GEMS_HELIOS_01",VR::IS,VM::VM1,"RPeakTimeDelay",false },
+ {0x0045,0x0044,"GEMS_HELIOS_01",VR::IS,VM::VM1,"ActualRPeakTimeDelay",false },
+ {0x0045,0x0045,"GEMS_HELIOS_01",VR::ST,VM::VM1,"CardiacScanOptions",false },
+ {0x0045,0x0050,"GEMS_HELIOS_01",VR::FD,VM::VM1,"Temporal Center View Angle",false },
+ {0x0045,0x0051,"GEMS_HELIOS_01",VR::FD,VM::VM1,"Recon Center View Angle",false },
+ {0x0045,0x0052,"GEMS_HELIOS_01",VR::CS,VM::VM1,"WideCone Masking",false },
+ {0x0045,0x0053,"GEMS_HELIOS_01",VR::FD,VM::VM1,"WideCone Corner Blending Radius",false },
+ {0x0045,0x0054,"GEMS_HELIOS_01",VR::FD,VM::VM1,"WideCone Corner Blending Radius Offset",false },
+ {0x0045,0x0055,"GEMS_HELIOS_01",VR::CS,VM::VM1,"Internal Recon Algorithm",false },
{0x004b,0x0001,"GEMS_HINO_CT_01",VR::DS,VM::VM1_n,"Beam Thickness",false },
{0x004b,0x0002,"GEMS_HINO_CT_01",VR::DS,VM::VM1_n,"R Time",false },
{0x004b,0x0003,"GEMS_HINO_CT_01",VR::IS,VM::VM1,"HBC number",false },
diff --git a/Source/DataDictionary/privatedicts.xml b/Source/DataDictionary/privatedicts.xml
index 18414af70..c362ea42b 100644
--- a/Source/DataDictionary/privatedicts.xml
+++ b/Source/DataDictionary/privatedicts.xml
@@ -2638,66 +2638,68 @@
<entry owner="FDMS 1.0" group="0021" element="xx70" vr="IS" vm="1" name="Film Number within the Series"/>
<entry owner="FDMS 1.0" group="0021" element="xx80" vr="OB" vm="1" name="Equipment Type-Specific Information"/>
<entry owner="FDMS 1.0" group="0021" element="xx90" vr="CS" vm="1" name="LUT Number"/>
- <entry owner="FDMS 1.0" group="0023" element="xx10" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0023" element="xx20" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0023" element="xx30" vr="SQ" vm="1" name="?"/>
+ <entry owner="FDMS 1.0" group="0023" element="xx10" vr="SQ" vm="1" name="Left-image Processing Parameter Sequence"/>
+ <entry owner="FDMS 1.0" group="0023" element="xx20" vr="SQ" vm="1" name="Right-image Processing Parameter Sequence"/>
+ <entry owner="FDMS 1.0" group="0023" element="xx30" vr="SQ" vm="1" name="Single-image Processing Parameter Sequence"/>
<entry owner="FDMS 1.0" group="0025" element="xx10" vr="US" vm="1" name="Relative Light Emission Amount Sk"/>
<entry owner="FDMS 1.0" group="0025" element="xx11" vr="US" vm="1" name="Term of Correction for Each IP Type St"/>
<entry owner="FDMS 1.0" group="0025" element="xx12" vr="US" vm="1" name="Reading Gain Gp"/>
- <entry owner="FDMS 1.0" group="0025" element="xx13" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx15" vr="CS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx20" vr="US" vm="2" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx21" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx30" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx31" vr="SS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx32" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx33" vr="SS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx34" vr="SS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx40" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx41" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx42" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx43" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx50" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx51" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx52" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx53" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx60" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx61" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx62" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx63" vr="CS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx70" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx71" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx72" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx73" vr="US" vm="6" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx74" vr="US" vm="6" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx80" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx81" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx82" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx83" vr="US" vm="6" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx84" vr="US" vm="6" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx90" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx91" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx92" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx93" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx94" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx95" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xx96" vr="CS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xxa0" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xxa1" vr="SS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xxa2" vr="US" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0025" element="xxa3" vr="SS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx10" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx20" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx30" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx40" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx50" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx60" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx70" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xx80" vr="SQ" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xxa0" vr="IS" vm="1" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xxa1" vr="CS" vm="2" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xxa2" vr="CS" vm="2" name="?"/>
- <entry owner="FDMS 1.0" group="0027" element="xxa3" vr="SS" vm="1-n" name="?"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx13" vr="US" vm="1" name="Latitude"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx15" vr="CS" vm="1" name="Image Processing Selection Flag"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx16" vr="US" vm="1" name="Min"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx17" vr="US" vm="1" name="Max"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx20" vr="US" vm="2" name="Sensitivity Shift (S-SHFT)"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx21" vr="US" vm="1" name="Contrast Shift (C-SHIFT)"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx30" vr="US" vm="1" name="GT"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx31" vr="SS" vm="1" name="GA"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx32" vr="US" vm="1" name="GC"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx33" vr="SS" vm="1" name="GS"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx34" vr="SS" vm="1" name="tan θ"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx40" vr="US" vm="1" name="RT"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx41" vr="US" vm="1" name="RN"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx42" vr="US" vm="1" name="RE"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx43" vr="US" vm="1" name="N"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx50" vr="US" vm="1" name="DRT"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx51" vr="US" vm="1" name="DRN"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx52" vr="US" vm="1" name="DRE"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx53" vr="US" vm="1" name="DN"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx60" vr="US" vm="1" name="ORN"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx61" vr="US" vm="1" name="ORE"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx62" vr="US" vm="1" name="ON"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx63" vr="CS" vm="1" name="ORD"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx70" vr="US" vm="1" name="MDT"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx71" vr="US" vm="1" name="MDB"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx72" vr="US" vm="1" name="MDE"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx73" vr="US" vm="1-n" name="MFP-DRC Suppression Characteristics Parameters"/> <!-- 6-8 -->
+ <entry owner="FDMS 1.0" group="0025" element="xx74" vr="US" vm="1-n" name="MFP-DRC Frequency Characteristics Parameters"/> <!-- 6-8 -->
+ <entry owner="FDMS 1.0" group="0025" element="xx80" vr="US" vm="1" name="MRT"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx81" vr="US" vm="1" name="MRB"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx82" vr="US" vm="1" name="MRE"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx83" vr="US" vm="1-n" name="MFP-USM Suppression Characteristics Parameters"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx84" vr="US" vm="1-n" name="MFP-USM Frequency Characteristics Parameters"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx90" vr="US" vm="1" name="PTE (α edge)"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx91" vr="US" vm="1" name="PTR (α calc)"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx92" vr="US" vm="1" name="PRN"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx93" vr="US" vm="1" name="PRE"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx94" vr="US" vm="1" name="PEM Sstd"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx95" vr="US" vm="1" name="PEM Lstd"/>
+ <entry owner="FDMS 1.0" group="0025" element="xx96" vr="CS" vm="1" name="PEM Unsharp Mask Value N"/>
+ <entry owner="FDMS 1.0" group="0025" element="xxa0" vr="US" vm="1" name="MFP GT"/>
+ <entry owner="FDMS 1.0" group="0025" element="xxa1" vr="SS" vm="1" name="MFP GA"/>
+ <entry owner="FDMS 1.0" group="0025" element="xxa2" vr="US" vm="1" name="MFP GC"/>
+ <entry owner="FDMS 1.0" group="0025" element="xxa3" vr="SS" vm="1" name="MFP GS"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx10" vr="SQ" vm="1" name="γ Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx20" vr="SQ" vm="1" name="β Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx30" vr="SQ" vm="1" name="DRC Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx40" vr="SQ" vm="1" name="MFP-DRC Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx50" vr="SQ" vm="1" name="MFP-USM Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx60" vr="SQ" vm="1" name="PEM α Edge Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx70" vr="SQ" vm="1" name="PEM α Calc Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xx80" vr="SQ" vm="1" name="MFP γ Raw Data Table Sequence"/>
+ <entry owner="FDMS 1.0" group="0027" element="xxa0" vr="IS" vm="1" name="No. of Data"/>
+ <entry owner="FDMS 1.0" group="0027" element="xxa1" vr="CS" vm="2" name="Data Input Type"/>
+ <entry owner="FDMS 1.0" group="0027" element="xxa2" vr="CS" vm="2" name="Data Output Type"/>
+ <entry owner="FDMS 1.0" group="0027" element="xxa3" vr="US_SS" vm="1-n" name="Raw Data"/> <!-- 4-n -->
<entry owner="FDMS 1.0" group="0029" element="xx20" vr="CS" vm="1" name="Image Scanning Direction"/>
<entry owner="FDMS 1.0" group="0029" element="xx25" vr="CS" vm="1" name="Image Rotation/Reversal Information"/>
<entry owner="FDMS 1.0" group="0029" element="xx30" vr="CS" vm="1" name="Extended Reading Size Value"/>
@@ -3814,17 +3816,26 @@
<entry owner="GEMS_HELIOS_01" group="0045" element="xx1f" vr="SS" vm="1" name="Cross Talk Calibration Date"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx20" vr="SS" vm="1" name="Cross Talk Calibration Time"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx21" vr="SS" vm="1" name="Iterbone Flag"/>
- <entry owner="GEMS_HELIOS_01" group="0045" element="xx22" vr="SS" vm="1" name="Perisstaltic Flag"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx22" vr="SS" vm="1" name="Peristaltic Flag"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx30" vr="CS" vm="1" name="CardiacReconAlgorithm"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx31" vr="CS" vm="1" name="AvgHeartRateForImage"/>
- <entry owner="GEMS_HELIOS_01" group="0045" element="xx32" vr="FL" vm="1" name="TemporalResolution"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx32" vr="FL" vm="1" name="Temporal Resolution"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx33" vr="CS" vm="1" name="PctRpeakDelay"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx34" vr="CS" vm="1" name="ActualPctRpeakDelay"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx36" vr="CS" vm="1" name="EkgFullMaStartPhase"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx37" vr="CS" vm="1" name="EkgFullMaEndPhase"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx38" vr="CS" vm="1" name="EkgModulationMaxMa"/>
<entry owner="GEMS_HELIOS_01" group="0045" element="xx39" vr="CS" vm="1" name="EkgModulationMinMa"/>
- <entry owner="GEMS_HELIOS_01" group="0045" element="xx3b" vr="LO" vm="1" name="NoiseReductionImageFilterDesc"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx3b" vr="LO" vm="1" name="Noise Reduction Image Filter Description"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx3f" vr="IS" vm="1" name="RPeakTimeDelay"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx44" vr="IS" vm="1" name="ActualRPeakTimeDelay"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx45" vr="ST" vm="1" name="CardiacScanOptions"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx50" vr="FD" vm="1" name="Temporal Center View Angle"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx51" vr="FD" vm="1" name="Recon Center View Angle"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx52" vr="CS" vm="1" name="WideCone Masking"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx53" vr="FD" vm="1" name="WideCone Corner Blending Radius"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx54" vr="FD" vm="1" name="WideCone Corner Blending Radius Offset"/>
+ <entry owner="GEMS_HELIOS_01" group="0045" element="xx55" vr="CS" vm="1" name="Internal Recon Algorithm"/>
<entry owner="GEMS_HINO_CT_01" group="004b" element="xx01" vr="DS" vm="1-n" name="Beam Thickness"/>
<entry owner="GEMS_HINO_CT_01" group="004b" element="xx02" vr="DS" vm="1-n" name="R Time"/>
<entry owner="GEMS_HINO_CT_01" group="004b" element="xx03" vr="IS" vm="1" name="HBC number"/>
https://sourceforge.net/p/gdcm/gdcm/ci/63d1d6256cf02e3793079b529baa156697049504/
commit 63d1d6256cf02e3793079b529baa156697049504
Author: Mathieu Malaterre <mat...@gm...>
Date: Fri Sep 9 06:06:22 2022 -0700
add support for new style
diff --git a/Applications/Cxx/CMakeLists.txt b/Applications/Cxx/CMakeLists.txt
index f3188013f..6b3e0bb99 100644
--- a/Applications/Cxx/CMakeLists.txt
+++ b/Applications/Cxx/CMakeLists.txt
@@ -182,6 +182,8 @@ foreach(exename ${GDCM_EXECUTABLE_NAME})
endif()
elseif(${exename} STREQUAL "gdcmstream")
target_link_libraries(${exename} ${GDCM_OPENJPEG_LIBRARIES})
+ elseif(${exename} STREQUAL "gdcmdump")
+ target_link_libraries(${exename} ${GDCM_ZLIB_LIBRARIES})
elseif(${exename} STREQUAL "gdcminfo")
if(GDCM_USE_SYSTEM_POPPLER)
target_link_libraries(${exename} ${POPPLER_LIBRARIES})
diff --git a/Applications/Cxx/gdcmdump.cxx b/Applications/Cxx/gdcmdump.cxx
index 4c143b1c7..0a6e3b5ed 100644
--- a/Applications/Cxx/gdcmdump.cxx
+++ b/Applications/Cxx/gdcmdump.cxx
@@ -51,6 +51,7 @@
#include "gdcmBase64.h"
#include "gdcmMEC_MR3.h"
#include "gdcmTagKeywords.h"
+#include "gdcmDeflateStream.h"
#include <string>
#include <iostream>
@@ -702,6 +703,26 @@ static int DumpEl2_new(const gdcm::DataSet & ds)
const gdcm::ByteValue * bv = de01f7_26.GetByteValue();
const char *begin = bv->GetPointer();
+ const size_t buf_len= bv->GetLength();
+
+ bool isgzip = false;
+ if( buf_len > (0x15f + 3) ) {
+ const unsigned char *sig = (const unsigned char*)begin + 0x15f;
+ isgzip = sig[0] == 0x1f && sig[1] == 0x8b && sig[2] == 0x08 /* DEFLATE */;
+ }
+
+ if( isgzip ) {
+ size_t offset = 0x15f;
+ size_t len = buf_len - 0x15f;
+ std::string str( begin + offset, begin + len );
+ std::istringstream is( str );
+
+ zlib_stream::zip_istream gzis( is );
+ std::string out;
+ while( std::getline(gzis, out) ) {
+ std::cout << out << std::endl;
+ }
+ } else {
uint32_t val0[3];
memcpy( &val0, begin, sizeof( val0 ) );
assert( val0[0] == 0xF22D );
@@ -721,6 +742,7 @@ static int DumpEl2_new(const gdcm::DataSet & ds)
std::cout << std::endl;
begin += o;
}
+ }
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
Applications/Cxx/CMakeLists.txt | 2 +
Applications/Cxx/gdcmdump.cxx | 22 ++++
Source/DataDictionary/gdcmPrivateDefaultDicts.cxx | 131 ++++++++++++----------
Source/DataDictionary/privatedicts.xml | 131 ++++++++++++----------
4 files changed, 166 insertions(+), 120 deletions(-)
hooks/post-receive
--
Grassroots DICOM
|
