Accept HTJ2K compressed images by default configuration #4280

 Accept Confocal Microscopy (Tiled Pyramidal) Image by default configuration #4281

dcm4chee-arc-assembly/src/main/resources/ldap/5.31.2/update-dev-5.31.2.ldif

@@ -0,0 +1,27 @@
+version: 1
+
+dn: dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: modify
+replace: dicomVendorData
+dicomVendorData:< file:vendor-data.zip
+
+dn: dicomTransferSyntax=1.2.840.10008.1.2.4.201,cn=Image Reader Factory,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dcmJavaClassName: org.dcm4che3.opencv.NativeImageReader
+dcmIIOFormatName: jpeg2000-cv
+dicomTransferSyntax: 1.2.840.10008.1.2.4.201
+objectClass: dcmImageReader
+
+dn: dicomTransferSyntax=1.2.840.10008.1.2.4.202,cn=Image Reader Factory,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dcmJavaClassName: org.dcm4che3.opencv.NativeImageReader
+dcmIIOFormatName: jpeg2000-cv
+dicomTransferSyntax: 1.2.840.10008.1.2.4.202
+objectClass: dcmImageReader
+
+dn: dicomTransferSyntax=1.2.840.10008.1.2.4.203,cn=Image Reader Factory,dicomDeviceName=dcm4chee-arc,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dcmJavaClassName: org.dcm4che3.opencv.NativeImageReader
+dcmIIOFormatName: jpeg2000-cv
+dicomTransferSyntax: 1.2.840.10008.1.2.4.203
+objectClass: dcmImageReader

dcm4chee-arc-assembly/src/main/resources/ldap/5.31.2/update-storescp-5.31.2.ldif

@@ -0,0 +1,21 @@
+version: 1
+
+dn: cn=Confocal Microscopy Image Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dicomSOPClass: 1.2.840.10008.5.1.4.1.1.77.1.8
+dicomTransferRole: SCP
+dicomTransferSyntax: 1.2.840.10008.1.2
+dicomTransferSyntax: 1.2.840.10008.1.2.1
+objectClass: dicomTransferCapability
+objectClass: dcmTransferCapability
+cn: Confocal Microscopy Image Storage SCP
+
+dn: cn=Confocal Microscopy Tiled Pyramidal Image Storage SCP,dicomAETitle=STORESCP,dicomDeviceName=storescp,cn=Devices,cn=DICOM Configuration,dc=dcm4che,dc=org
+changetype: add
+dicomSOPClass: 1.2.840.10008.5.1.4.1.1.77.1.9
+dicomTransferRole: SCP
+dicomTransferSyntax: 1.2.840.10008.1.2
+dicomTransferSyntax: 1.2.840.10008.1.2.1
+objectClass: dicomTransferCapability
+objectClass: dcmTransferCapability
+cn: Confocal Microscopy Tiled Pyramidal Image Storage SCP

dcm4chee-arc-conf-test/src/test/java/org/dcm4chee/arc/conf/ArchiveDeviceFactory.java

@@ -778,6 +778,8 @@ private static AuditSuppressCriteria suppressAuditQueryFromArchive() {
             UID.OphthalmicOpticalCoherenceTomographyBscanVolumeAnalysisStorage,
             UID.VLWholeSlideMicroscopyImageStorage,
             UID.DermoscopicPhotographyImageStorage,
+            UID.ConfocalMicroscopyImageStorage,
+            UID.ConfocalMicroscopyTiledPyramidalImageStorage,
             UID.OphthalmicThicknessMapStorage,
             UID.CornealTopographyMapStorage,
             UID.PositronEmissionTomographyImageStorage,
@@ -816,6 +818,9 @@ private static AuditSuppressCriteria suppressAuditQueryFromArchive() {
             UID.JPEGLSNearLossless,
             UID.JPEG2000Lossless,
             UID.JPEG2000,
+            UID.HTJ2KLossless,
+            UID.HTJ2KLosslessRPCL,
+            UID.HTJ2K,
             UID.RLELossless
     };
     static final String[] VIDEO_CUIDS = {

dcm4chee-arc-ui2/src/app/constants/dcm4che-dict-cuids.js

@@ -152,6 +152,8 @@ DCM4CHE.SOPClass = (function (dictionary) {
 "1.2.840.10008.5.1.4.1.1.77.1.5.8":"Ophthalmic Optical Coherence Tomography B-scan Volume Analysis Storage",
 "1.2.840.10008.5.1.4.1.1.77.1.6":"VL Whole Slide Microscopy Image Storage",
 "1.2.840.10008.5.1.4.1.1.77.1.7":"Dermoscopic Photography Image Storage",
+"1.2.840.10008.5.1.4.1.1.77.1.8":"Confocal Microscopy Image Storage",
+"1.2.840.10008.5.1.4.1.1.77.1.9":"Confocal Microscopy Tiled Pyramidal Image Storage",
 "1.2.840.10008.5.1.4.1.1.78.1":"Lensometry Measurements Storage",
 "1.2.840.10008.5.1.4.1.1.78.2":"Autorefraction Measurements Storage",
 "1.2.840.10008.5.1.4.1.1.78.3":"Keratometry Measurements Storage",

dcm4chee-arc-ui2/src/app/constants/dcm4che-dict-names.js

@@ -1005,6 +1005,8 @@ DCM4CHE.elementName = (function (dictionary) {
 "00181201":"Time of Last Calibration",
 "00181202":"DateTime of Last Calibration",
 "00181203":"Calibration DateTime",
+"00181204":"Date of Manufacture",
+"00181205":"Date of Installation",
 "00181210":"Convolution Kernel",
 "00181240":"Upper/Lower Pixel Values",
 "00181242":"Actual Frame Duration",
@@ -1622,6 +1624,27 @@ DCM4CHE.elementName = (function (dictionary) {
 "0018980E":"Transducer Beam Steering Code Sequence",
 "0018980F":"Transducer Application Code Sequence",
 "00189810":"Zero Velocity Pixel Value",
+"00189821":"Photoacoustic Excitation Characteristics Sequence",
+"00189822":"Excitation Spectral Width",
+"00189823":"Excitation Energy",
+"00189824":"Excitation Pulse Duration",
+"00189825":"Excitation Wavelength Sequence",
+"00189826":"Excitation Wavelength",
+"00189828":"Illumination Translation Flag",
+"00189829":"Acoustic Coupling Medium Flag",
+"0018982A":"Acoustic Coupling Medium Code Sequence",
+"0018982B":"Acoustic Coupling Medium Temperature",
+"0018982C":"Transducer Response Sequence",
+"0018982D":"Center Frequency",
+"0018982E":"Fractional Bandwidth",
+"0018982F":"Lower Cutoff Frequency",
+"00189830":"Upper Cutoff Frequency",
+"00189831":"Transducer Technology Sequence",
+"00189832":"Sound Speed Correction Mechanism Code Sequence",
+"00189833":"Object Sound Speed",
+"00189834":"Acoustic Coupling Medium Sound Speed",
+"00189835":"Photoacoustic Image Frame Type Sequence",
+"00189836":"Image Data Type Code Sequence",
 "00189900":"Reference Location Label",
 "00189901":"Reference Location Description",
 "00189902":"Reference Basis Code Sequence",
@@ -2934,6 +2957,10 @@ DCM4CHE.elementName = (function (dictionary) {
 "00480111":"Condenser Lens Power",
 "00480112":"Objective Lens Power",
 "00480113":"Objective Lens Numerical Aperture",
+"00480114":"Confocal Mode",
+"00480115":"Tissue Location",
+"00480116":"Confocal Microscopy Image Frame Type Sequence",
+"00480117":"Image Acquisition Depth",
 "00480120":"Palette Color Lookup Table Sequence",
 "00480200":"Referenced Image Navigation Sequence",
 "00480201":"Top Left Hand Corner of Localizer Area",
@@ -4690,6 +4717,7 @@ DCM4CHE.elementName = (function (dictionary) {
 "300A0688":"RT Beam Modifier Definition Distance",
 "300A0689":"Beam Area Limit Sequence",
 "300A068A":"Referenced RT Prescription Sequence",
+"300A068B":"Dose Value Interpretation",
 "300A0700":"Treatment Session UID",
 "300A0701":"RT Radiation Usage",
 "300A0702":"Referenced RT Radiation Set Sequence",
@@ -4807,6 +4835,7 @@ DCM4CHE.elementName = (function (dictionary) {
 "300C0126":"Beam Hold Transition",
 "300C0127":"Beam Hold Transition DateTime",
 "300C0128":"Beam Hold Originating Device Sequence",
+"300C0129":"Beam Hold Transition Trigger Source",
 "300E0002":"Approval Status",
 "300E0004":"Review Date",
 "300E0005":"Review Time",
@@ -5103,7 +5132,7 @@ DCM4CHE.elementName = (function (dictionary) {
 "50xx2610":"Curve Referenced Overlay Group",
 "50xx3000":"Curve Data",
 "52009229":"Shared Functional Groups Sequence",
-"52009230":"Per-frame Functional Groups Sequence",
+"52009230":"Per-Frame Functional Groups Sequence",
 "54000100":"Waveform Sequence",
 "54000110":"Channel Minimum Value",
 "54000112":"Channel Maximum Value",

dcm4chee-arc-ui2/src/app/constants/dcm4che-dict-tsuids.js

@@ -58,6 +58,11 @@ DCM4CHE.TransferSyntax = (function (dictionary) {
 "1.2.840.10008.1.2.4.106.1":"Fragmentable MPEG-4 AVC/H.264 Stereo High Profile / Level 4.2",
 "1.2.840.10008.1.2.4.107":"HEVC/H.265 Main Profile / Level 5.1",
 "1.2.840.10008.1.2.4.108":"HEVC/H.265 Main 10 Profile / Level 5.1",
+"1.2.840.10008.1.2.4.201":"High-Throughput JPEG 2000 Image Compression (Lossless Only)",
+"1.2.840.10008.1.2.4.202":"High-Throughput JPEG 2000 with RPCL Options Image Compression (Lossless Only)",
+"1.2.840.10008.1.2.4.203":"High-Throughput JPEG 2000 Image Compression",
+"1.2.840.10008.1.2.4.204":"JPIP HTJ2K Referenced",
+"1.2.840.10008.1.2.4.205":"JPIP HTJ2K Referenced Deflate",
 "1.2.840.10008.1.2.5":"RLE Lossless",
 "1.2.840.10008.1.2.6.1":"RFC 2557 MIME encapsulation (Retired)",
 "1.2.840.10008.1.2.6.2":"XML Encoding (Retired)",