Merge pull request #11 from dcm4che/dev

Release 0.5.5
dcm4che · Sep 12, 2023 · 6a7033c · 6a7033c
2 parents cd5a6fa + 98a098e
commit 6a7033c
Show file tree

Hide file tree

Showing 12 changed files with 12,356 additions and 4,705 deletions.
diff --git a/README.MD b/README.MD
@@ -7,8 +7,8 @@ If you encounter unsupported fields you can always use the `getAttributes()` met
 
 ## Dependencies
 This library is based on the 
-* [DICOM Standard Version 2022d](https://dicom.nema.org/medical/dicom/2022d/output/chtml/part01/ps3.1.html).
-* [dcm4che version 5.29.0](https://github.com/dcm4che/dcm4che/releases/tag/5.29.0)
+* [DICOM Standard Version 2022e](https://dicom.nema.org/medical/dicom/2022e/output/chtml/part01/ps3.1.html).
+* [dcm4che version 5.31.0](https://github.com/dcm4che/dcm4che/releases/tag/5.31.0)
 
 ## How to add it to your project
 ### Standard Library
@@ -25,7 +25,7 @@ repositories {
 
 ```groovy
 dependencies {
-    implementation 'org.dcm4che:dcm4che-typeddicom-lib-std:0.5.4'
+    implementation 'org.dcm4che:dcm4che-typeddicom-lib-std:0.5.5'
 }
 ```
 
@@ -41,7 +41,7 @@ repositories {
 
 ```kotlin
 dependencies {
-    implementation("org.dcm4che:dcm4che-typeddicom-lib-std:0.5.4")
+    implementation("org.dcm4che:dcm4che-typeddicom-lib-std:0.5.5")
 }
 ```
 
@@ -60,7 +60,7 @@ dependencies {
 <dependency>
     <groupId>org.dcm4che</groupId>
     <artifactId>dcm4che-typeddicom</artifactId>
-    <version>0.5.4</version>
+    <version>0.5.5</version>
 </dependency>
 ```
 ### Use private tags with the gradle plugin
@@ -78,7 +78,7 @@ buildscript {
 
 plugins {
     id 'java-library'
-    id 'org.dcm4che.typeddicom-java-generator' version '0.5.4'
+    id 'org.dcm4che.typeddicom-java-generator' version '0.5.5'
 }
 
 generateTypeddicomJavaSources {
@@ -99,7 +99,7 @@ buildscript {
 
 plugins {
     id("java-library")
-    id("org.dcm4che.typeddicom-java-generator") version "0.5.4"
+    id("org.dcm4che.typeddicom-java-generator") version "0.5.5"
 }
 
 generateTypeddicomJavaSources {

diff --git a/...e-typeddicom-java-generator-gradleplugin/src/main/resources/dicom-standard-xml/part03.xml b/...e-typeddicom-java-generator-gradleplugin/src/main/resources/dicom-standard-xml/part03.xml
diff --git a/...e-typeddicom-java-generator-gradleplugin/src/main/resources/dicom-standard-xml/part04.xml b/...e-typeddicom-java-generator-gradleplugin/src/main/resources/dicom-standard-xml/part04.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <book xmlns="http://docbook.org/ns/docbook" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xl="http://www.w3.org/1999/xlink" label="PS3.4" version="5.0" xml:id="PS3.4">
     <title>PS3.4</title>
-    <subtitle>DICOM PS3.4 2022d - Service Class Specifications</subtitle>
+    <subtitle>DICOM PS3.4 2022e - Service Class Specifications</subtitle>
     <info>
         <author>
             <orgname>DICOM Standards Committee</orgname>
@@ -5962,6 +5962,48 @@
                         </td>
                         <td align="left" colspan="1" rowspan="1"/>
                     </tr>
+                    <tr valign="top">
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>Enhanced RT Image Storage</para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>1.2.840.10008.5.1.4.1.1.481.23</para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>
+                                <olink targetdoc="PS3.3" targetptr="sect_A.86.1.15" xrefstyle="select: title"/>
+                            </para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1"/>
+                    </tr>
+                    <tr valign="top">
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>Enhanced Continuous RT Image Storage</para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>1.2.840.10008.5.1.4.1.1.481.24</para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>
+                                <olink targetdoc="PS3.3" targetptr="sect_A.86.1.16" xrefstyle="select: title"/>
+                            </para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1"/>
+                    </tr>
+                    <tr valign="top">
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>RT Patient Position Acquisition Instruction Storage</para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>1.2.840.10008.5.1.4.1.1.481.25</para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1">
+                            <para>
+                                <olink targetdoc="PS3.3" targetptr="sect_A.86.1.17" xrefstyle="select: title"/>
+                            </para>
+                        </td>
+                        <td align="left" colspan="1" rowspan="1"/>
+                    </tr>
                     <tr valign="top">
                         <td align="left" colspan="1" rowspan="1">
                             <para xml:id="para_f4e800a4-4d22-4bcf-8569-5bdad38c0a56">RT Beams Delivery Instruction Storage</para>

diff --git a/...e-typeddicom-java-generator-gradleplugin/src/main/resources/dicom-standard-xml/part05.xml b/...e-typeddicom-java-generator-gradleplugin/src/main/resources/dicom-standard-xml/part05.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <book xmlns="http://docbook.org/ns/docbook" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xl="http://www.w3.org/1999/xlink" label="PS3.5" version="5.0" xml:id="PS3.5">
   <title>PS3.5</title>
-  <subtitle>DICOM PS3.5 2022d - Data Structures and Encoding</subtitle>
+  <subtitle>DICOM PS3.5 2022e - Data Structures and Encoding</subtitle>
   <info>
     <author>
       <orgname>DICOM Standards Committee</orgname>
@@ -8214,7 +8214,7 @@
           </itemizedlist>
         </listitem>
       </orderedlist>
-      <para xml:id="para_ce6f5e16-cce6-4cc0-a193-665980c733ce">This DICOM JPIP Referenced Transfer Syntax shall be identified by a UID of Value "1.2.840.10008.1.2.4.94 ".</para>
+      <para xml:id="para_ce6f5e16-cce6-4cc0-a193-665980c733ce">This DICOM JPIP Referenced Transfer Syntax shall be identified by a UID of Value "1.2.840.10008.1.2.4.94".</para>
     </section>
     <section label="A.7" status="2" xml:id="sect_A.7">
       <title>DICOM JPIP Referenced Deflate Transfer Syntax (Explicit VR)</title>