# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1718565142 -7200
# Node ID 054e364749982843dbd2c1b58063415d416c4c21
# Parent  d34f662a3a6cf9b948a00a735ced17ef4c1af636
OrthancSTL-1.2

diff -r d34f662a3a6c -r 054e36474998 CITATION.cff
--- a/CITATION.cff	Sat Jun 15 17:24:45 2024 +0200
+++ b/CITATION.cff	Sun Jun 16 21:12:22 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.1"
-date-released: 2024-05-22
+version: "1.2"
+date-released: 2024-06-16
diff -r d34f662a3a6c -r 054e36474998 CMakeLists.txt
--- a/CMakeLists.txt	Sat Jun 15 17:24:45 2024 +0200
+++ b/CMakeLists.txt	Sun Jun 16 21:12:22 2024 +0200
@@ -35,13 +35,13 @@
 cmake_minimum_required(VERSION 3.12)
 project(OrthancSTL)
 
-set(ORTHANC_STL_VERSION "mainline")
+set(ORTHANC_STL_VERSION "1.2")
 
 if (ORTHANC_STL_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.3")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.4")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r d34f662a3a6c -r 054e36474998 NEWS
--- a/NEWS	Sat Jun 15 17:24:45 2024 +0200
+++ b/NEWS	Sun Jun 16 21:12:22 2024 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.2 (2024-06-16)
+========================
+
 * Added 3DHOP viewer (version 4.3) for Nexus models
 * Upgraded Nexus viewer to version 4.3 (Nexus 2020)
 
diff -r d34f662a3a6c -r 054e36474998 Sources/OrthancExplorer.js
--- a/Sources/OrthancExplorer.js	Sat Jun 15 17:24:45 2024 +0200
+++ b/Sources/OrthancExplorer.js	Sun Jun 16 21:12:22 2024 +0200
@@ -497,7 +497,8 @@
       url: '/instances/' + instanceId + '/content/0008,9123',
       success: function(creatorVersionUid) {
         if (creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_MAINLINE}' ||
-            creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_1_1}') {
+            creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_1_1}' ||
+            creatorVersionUid == '${ORTHANC_STL_CREATOR_VERSION_UID_1_2}') {
           var b = $('<a>')
               .attr('id', id)
               .attr('data-role', 'button')
diff -r d34f662a3a6c -r 054e36474998 Sources/Plugin.cpp
--- a/Sources/Plugin.cpp	Sat Jun 15 17:24:45 2024 +0200
+++ b/Sources/Plugin.cpp	Sun Jun 16 21:12:22 2024 +0200
@@ -75,6 +75,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 ORTHANC_STL_CREATOR_VERSION_UID_1_2 = "1.2.826.0.1.3680043.8.498.69380801008493335183088431949117714013";
 
 static const char* const GetCreatorVersionUid(const std::string& version)
 {
@@ -86,6 +87,10 @@
   {
     return ORTHANC_STL_CREATOR_VERSION_UID_1_1;
   }
+  else if (version == "1.2")
+  {
+    return ORTHANC_STL_CREATOR_VERSION_UID_1_2;
+  }
   else
   {
     throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
@@ -96,6 +101,7 @@
 {
   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;
+  dictionary["ORTHANC_STL_CREATOR_VERSION_UID_1_2"] = ORTHANC_STL_CREATOR_VERSION_UID_1_2;
 }
 
 #endif