From 3d86b5f876d6481bcc57de88a0ba1f974f4ee263 Mon Sep 17 00:00:00 2001 From: James Petts Date: Mon, 10 Aug 2020 10:40:11 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Optional=20disable=20mea?= =?UTF-8?q?surements=20panel=20in=20app=20config=20(#1912)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Can disable the measurements panel by adding disableMeasurementPanel: true to the appConfig. Closes: #1864 --- platform/viewer/public/config/idc.js | 1 + platform/viewer/src/App.js | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/platform/viewer/public/config/idc.js b/platform/viewer/public/config/idc.js index a92516d12..3077f3970 100644 --- a/platform/viewer/public/config/idc.js +++ b/platform/viewer/public/config/idc.js @@ -2,6 +2,7 @@ window.config = function(props) { var servicesManager = props.servicesManager; return { + disableMeasurementPanel: true, routerBasename: '/', enableGoogleCloudAdapter: true, enableGoogleCloudAdapterUI: false, diff --git a/platform/viewer/src/App.js b/platform/viewer/src/App.js index 07e62c283..2bf95a8bf 100644 --- a/platform/viewer/src/App.js +++ b/platform/viewer/src/App.js @@ -13,7 +13,7 @@ import { ModalProvider, DialogProvider, OHIFModal, - ErrorBoundary + ErrorBoundary, } from '@ohif/ui'; import { @@ -168,7 +168,7 @@ class App extends Component { if (this._userManager) { return ( - + @@ -200,7 +200,7 @@ class App extends Component { } return ( - + @@ -271,17 +271,21 @@ function _initExtensions(extensions, cornerstoneExtensionConfig, appConfig) { api: { contexts: CONTEXTS, hooks: { - useAppContext - } - } + useAppContext, + }, + }, }); const requiredExtensions = [ GenericViewerCommands, [OHIFCornerstoneExtension, cornerstoneExtensionConfig], - /* WARNING: MUST BE REGISTERED _AFTER_ OHIFCornerstoneExtension */ - MeasurementsPanel, ]; + + if (appConfig.disableMeasurementPanel !== true) { + /* WARNING: MUST BE REGISTERED _AFTER_ OHIFCornerstoneExtension */ + requiredExtensions.push(MeasurementsPanel); + } + const mergedExtensions = requiredExtensions.concat(extensions); extensionManager.registerExtensions(mergedExtensions); }