# HG changeset patch # User Sebastien Jodogne # Date 1710587090 -3600 # Node ID 11bc8a30403836386810d6c0f86c69e93d8bd770 # Parent 7926c9a097574fa61e1115b012145262bacf11ef fix deprecated calls diff -r 7926c9a09757 -r 11bc8a304038 Applications/Samples/RtViewerPlugin/Plugin.cpp --- a/Applications/Samples/RtViewerPlugin/Plugin.cpp Sat Mar 16 10:48:59 2024 +0100 +++ b/Applications/Samples/RtViewerPlugin/Plugin.cpp Sat Mar 16 12:04:50 2024 +0100 @@ -133,7 +133,7 @@ std::string explorer; Orthanc::EmbeddedResources::GetFileResource( explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER); - OrthancPluginExtendOrthancExplorer(OrthancPlugins::GetGlobalContext(), explorer.c_str()); + OrthancPlugins::ExtendOrthancExplorer(PLUGIN_NAME, explorer.c_str()); // RtViewer files below. // --------------------- diff -r 7926c9a09757 -r 11bc8a304038 Applications/StoneWebViewer/Plugin/Plugin.cpp --- a/Applications/StoneWebViewer/Plugin/Plugin.cpp Sat Mar 16 10:48:59 2024 +0100 +++ b/Applications/StoneWebViewer/Plugin/Plugin.cpp Sat Mar 16 12:04:50 2024 +0100 @@ -279,12 +279,12 @@ try { - OrthancPluginSetDescription(OrthancPlugins::GetGlobalContext(), "Stone Web viewer"); + OrthancPlugins::SetDescription(PLUGIN_NAME, "Stone Web viewer"); std::string explorer; Orthanc::EmbeddedResources::GetFileResource( explorer, Orthanc::EmbeddedResources::ORTHANC_EXPLORER); - OrthancPluginExtendOrthancExplorer(OrthancPlugins::GetGlobalContext(), explorer.c_str()); + OrthancPlugins::ExtendOrthancExplorer(PLUGIN_NAME, explorer.c_str()); OrthancPlugins::RegisterRestCallback (STONE_WEB_VIEWER_ROOT + "/configuration.json", true); diff -r 7926c9a09757 -r 11bc8a304038 RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp --- a/RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Sat Mar 16 10:48:59 2024 +0100 +++ b/RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.cpp Sat Mar 16 12:04:50 2024 +0100 @@ -4026,4 +4026,48 @@ result[request->headersKeys[i]] = request->headersValues[i]; } } + +#if !ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 4) + static void SetPluginProperty(const std::string& pluginIdentifier, + _OrthancPluginProperty property, + const std::string& value) + { + _OrthancPluginSetPluginProperty params; + params.plugin = pluginIdentifier.c_str(); + params.property = property; + params.value = value.c_str(); + + GetGlobalContext()->InvokeService(GetGlobalContext(), _OrthancPluginService_SetPluginProperty, ¶ms); + } +#endif + + void SetRootUri(const std::string& pluginIdentifier, + const std::string& uri) + { +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 4) + OrthancPluginSetRootUri2(GetGlobalContext(), pluginIdentifier.c_str(), uri.c_str()); +#else + SetPluginProperty(pluginIdentifier, _OrthancPluginProperty_RootUri, uri); +#endif + } + + void SetDescription(const std::string& pluginIdentifier, + const std::string& description) + { +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 4) + OrthancPluginSetDescription2(GetGlobalContext(), pluginIdentifier.c_str(), description.c_str()); +#else + SetPluginProperty(pluginIdentifier, _OrthancPluginProperty_Description, description); +#endif + } + + void ExtendOrthancExplorer(const std::string& pluginIdentifier, + const std::string& javascript) + { +#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 4) + OrthancPluginExtendOrthancExplorer2(GetGlobalContext(), pluginIdentifier.c_str(), javascript.c_str()); +#else + SetPluginProperty(pluginIdentifier, _OrthancPluginProperty_OrthancExplorer, javascript); +#endif + } } diff -r 7926c9a09757 -r 11bc8a304038 RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h --- a/RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Sat Mar 16 10:48:59 2024 +0100 +++ b/RenderingPlugin/Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h Sat Mar 16 12:04:50 2024 +0100 @@ -1435,4 +1435,13 @@ IWebDavCollection& collection); }; #endif + + void SetRootUri(const std::string& pluginIdentifier, + const std::string& uri); + + void SetDescription(const std::string& pluginIdentifier, + const std::string& description); + + void ExtendOrthancExplorer(const std::string& pluginIdentifier, + const std::string& javascript); }