# HG changeset patch # User Sebastien Jodogne <s.jodogne@gmail.com> # Date 1716384812 -7200 # Node ID c322c949bd8e2c0260583b28c21c2798f0987cd6 # Parent a5096a7ab7f1254d80443e15a1de6d8c5cdb8f94 OrthancSTL-1.1 diff -r a5096a7ab7f1 -r c322c949bd8e CITATION.cff --- a/CITATION.cff Tue May 21 16:02:49 2024 +0200 +++ b/CITATION.cff Wed May 22 15:33:32 2024 +0200 @@ -20,5 +20,5 @@ doi: "10.1145/3632047.3632051" license: "GPL-3.0-or-later" repository-code: "https://orthanc.uclouvain.be/hg/orthanc-stl/" -version: "1.0" -date-released: 2024-04-06 +version: "1.1" +date-released: 2024-05-22 diff -r a5096a7ab7f1 -r c322c949bd8e CMakeLists.txt --- a/CMakeLists.txt Tue May 21 16:02:49 2024 +0200 +++ b/CMakeLists.txt Wed May 22 15:33:32 2024 +0200 @@ -35,7 +35,7 @@ cmake_minimum_required(VERSION 3.12) project(OrthancSTL) -set(ORTHANC_STL_VERSION "mainline") +set(ORTHANC_STL_VERSION "1.1") if (ORTHANC_STL_VERSION STREQUAL "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") diff -r a5096a7ab7f1 -r c322c949bd8e NEWS --- a/NEWS Tue May 21 16:02:49 2024 +0200 +++ b/NEWS Wed May 22 15:33:32 2024 +0200 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Version 1.1 (2024-05-22) +======================== + => Minimum SDK version: 1.2.0 <= * Support for DICOM-ization of adaptive 3D models in the Nexus format: diff -r a5096a7ab7f1 -r c322c949bd8e Sources/OrthancExplorer.js --- a/Sources/OrthancExplorer.js Tue May 21 16:02:49 2024 +0200 +++ b/Sources/OrthancExplorer.js Wed May 22 15:33:32 2024 +0200 @@ -496,7 +496,8 @@ $.ajax({ url: '/instances/' + instanceId + '/content/0008,9123', success: function(creatorVersionUid) { - if (creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE}') { + if (creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE}' || + creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_1_1}') { var b = $('<a>') .attr('id', id) .attr('data-role', 'button') diff -r a5096a7ab7f1 -r c322c949bd8e Sources/Plugin.cpp --- a/Sources/Plugin.cpp Tue May 21 16:02:49 2024 +0200 +++ b/Sources/Plugin.cpp Wed May 22 15:33:32 2024 +0200 @@ -70,6 +70,7 @@ * **/ static const char* const ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE = "1.2.826.0.1.3680043.8.498.90514926286349109728701975613711986292"; +static const char* const ORTHANC_STL_CREATOR_VERSION_UID_1_1 = "1.2.826.0.1.3680043.8.498.13468660186379895313063577332103681503"; static const char* const GetCreatorVersionUid(const std::string& version) { @@ -77,6 +78,10 @@ { return ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE; } + else if (version == "1.1") + { + return ORTHANC_STL_CREATOR_VERSION_UID_1_1; + } else { throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); @@ -86,6 +91,7 @@ static void FillOrthancExplorerCreatorVersionUid(std::map<std::string, std::string>& dictionary) { dictionary["ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE"] = ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE; + dictionary["ORTHANC_STL_CREATOR_VERSION_UID_1_1"] = ORTHANC_STL_CREATOR_VERSION_UID_1_1; } #endif