From 9dd04122af39756a27d6556b9f4928cd30608809 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 3 Jun 2020 15:20:09 -0400 Subject: [PATCH] pull in tracked measurements panel --- .../src/getPanelModule.js | 2 +- modes/longitudinal/src/index.js | 34 ++++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/extensions/measurement-tracking/src/getPanelModule.js b/extensions/measurement-tracking/src/getPanelModule.js index ac48c0711..da65db5c5 100644 --- a/extensions/measurement-tracking/src/getPanelModule.js +++ b/extensions/measurement-tracking/src/getPanelModule.js @@ -25,7 +25,7 @@ function getPanelModule({ }), }, { - name: 'measure', + name: 'trackedMeasurements', iconName: 'list-bullets', iconLabel: 'Measure', label: 'Measurements', diff --git a/modes/longitudinal/src/index.js b/modes/longitudinal/src/index.js index 035110d15..68754c8bc 100644 --- a/modes/longitudinal/src/index.js +++ b/modes/longitudinal/src/index.js @@ -1,3 +1,13 @@ +const ohif = { + layout: 'org.ohif.default.layoutTemplateModule.viewerLayout', + sopClassHandler: 'org.ohif.default.sopClassHandlerModule.stack', +}; +const tracked = { + measurements: 'org.ohif.measurement-tracking.panelModule.trackedMeasurements', + thumbnailList: 'org.ohif.measurement-tracking.panelModule.seriesList', + viewport: 'org.ohif.measurement-tracking.viewportModule.cornerstone-tracked', +}; + export default function mode({ modeConfiguration }) { return { // TODO: We're using this as a route segment @@ -71,21 +81,15 @@ export default function mode({ modeConfiguration }) { }, layoutTemplate: ({ routeProps }) => { return { - id: 'org.ohif.default.layoutTemplateModule.viewerLayout', + id: ohif.layout, props: { - // named slots - leftPanels: [ - 'org.ohif.measurement-tracking.panelModule.seriesList', - ], + leftPanels: [tracked.thumbnailList], // TODO: Should be optional, or required to pass empty array for slots? - rightPanels: [], // // ['org.ohif.default.panelModule.measure'], + rightPanels: [tracked.measurements], viewports: [ { - namespace: - 'org.ohif.measurement-tracking.viewportModule.cornerstone-tracked', - displaySetsToDisplay: [ - 'org.ohif.default.sopClassHandlerModule.stack', - ], + namespace: tracked.viewport, + displaySetsToDisplay: [ohif.sopClassHandler], }, ], }, @@ -93,8 +97,12 @@ export default function mode({ modeConfiguration }) { }, }, ], - extensions: ['org.ohif.default', 'org.ohif.cornerstone', 'org.ohif.measurement-tracking'], - sopClassHandlers: ['org.ohif.default.sopClassHandlerModule.stack'], + extensions: [ + 'org.ohif.default', + 'org.ohif.cornerstone', + 'org.ohif.measurement-tracking', + ], + sopClassHandlers: [ohif.sopClassHandler], }; }