Mercurial > hg > orthanc-stl

changeset 69:c42bac260709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 16 Jun 2024 21:13:49 +0200
parents d34f662a3a6c (current diff) 054e36474998 (diff)
children a5c1be2ec26a
files CMakeLists.txt
diffstat 5 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CITATION.cff	Sat Jun 15 17:24:45 2024 +0200
+++ b/CITATION.cff	Sun Jun 16 21:13:49 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
--- a/CMakeLists.txt	Sat Jun 15 17:24:45 2024 +0200
+++ b/CMakeLists.txt	Sun Jun 16 21:13:49 2024 +0200
@@ -41,7 +41,7 @@
   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()
 
--- a/NEWS	Sat Jun 15 17:24:45 2024 +0200
+++ b/NEWS	Sun Jun 16 21:13:49 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)
 
--- a/Sources/OrthancExplorer.js	Sat Jun 15 17:24:45 2024 +0200
+++ b/Sources/OrthancExplorer.js	Sun Jun 16 21:13:49 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')
--- a/Sources/Plugin.cpp	Sat Jun 15 17:24:45 2024 +0200
+++ b/Sources/Plugin.cpp	Sun Jun 16 21:13:49 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