Mercurial > hg > orthanc
changeset 6552:0c97c019b493 default tip
updated dicom conformance statement for dcmtk 3.7.0
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 19 Dec 2025 18:08:18 +0100 |
| parents | a1be792caa93 |
| children | |
| files | OrthancServer/Resources/DicomConformanceStatement.py OrthancServer/Resources/DicomConformanceStatement.txt |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/Resources/DicomConformanceStatement.py Fri Dec 19 17:35:18 2025 +0100 +++ b/OrthancServer/Resources/DicomConformanceStatement.py Fri Dec 19 18:08:18 2025 +0100 @@ -39,9 +39,13 @@ # Read the current version of DCMTK with open(os.path.join(BASE, 'OrthancFramework', 'Resources', 'CMake', 'OrthancFrameworkParameters.cmake'), 'r') as f: - r = re.search(r'set\(DCMTK_STATIC_VERSION "([0-9.]+)" CACHE STRING', f.read()) - assert(r != None) - version = r.group(1) + version = None + for match in re.findall(r'set\(DCMTK_STATIC_VERSION_DEFAULT "([0-9.]+)"\)', f.read()): + if version != None: + raise Exception('Two versions of DCMTK were found') + elif match != '3.6.9': # Ignore the version for Windows XP + version = match + url = 'https://orthanc.uclouvain.be/downloads/third-party-downloads/dcmtk-%s.tar.gz' % version r = requests.get(url) r.raise_for_status()
--- a/OrthancServer/Resources/DicomConformanceStatement.txt Fri Dec 19 17:35:18 2025 +0100 +++ b/OrthancServer/Resources/DicomConformanceStatement.txt Fri Dec 19 18:08:18 2025 +0100 @@ -51,6 +51,7 @@ DICONDE_EddyCurrentMultiframeImageStorage | 1.2.840.10008.5.1.4.1.1.601.2 DICONDE_ThermographyImageStorage | 1.2.840.10008.5.1.4.1.1.601.3 DICONDE_ThermographyMultiFrameImageStorage | 1.2.840.10008.5.1.4.1.1.601.4 + DICONDE_UltrasoundWaveformStorage | 1.2.840.10008.5.1.4.1.1.601.5 DICOS_2DAITStorage | 1.2.840.10008.5.1.4.1.1.501.4 DICOS_3DAITStorage | 1.2.840.10008.5.1.4.1.1.501.5 DICOS_CTImageStorage | 1.2.840.10008.5.1.4.1.1.501.1 @@ -184,7 +185,9 @@ VideoPhotographicImageStorage | 1.2.840.10008.5.1.4.1.1.77.1.4.1 VisualAcuityMeasurementsStorage | 1.2.840.10008.5.1.4.1.1.78.5 VolumeRenderingVolumetricPresentationStateStorage | 1.2.840.10008.5.1.4.1.1.11.9 + WaveformAcquisitionPresentationStateStorage | 1.2.840.10008.5.1.4.1.1.9.100.2 WaveformAnnotationSRStorage | 1.2.840.10008.5.1.4.1.1.88.77 + WaveformPresentationStateStorage | 1.2.840.10008.5.1.4.1.1.9.100.1 WideFieldOphthalmicPhotography3DCoordinatesImageStorage | 1.2.840.10008.5.1.4.1.1.77.1.5.6 WideFieldOphthalmicPhotographyStereographicProjectionImageStorage | 1.2.840.10008.5.1.4.1.1.77.1.5.5 XADefinedProcedureProtocolStorage | 1.2.840.10008.5.1.4.1.1.200.7