fix(layouts): and fix thumbnail in touch and update migration guide f…

…or 3.8 release (#4052)
OHIF · Apr 19, 2024 · d250d04 · d250d04
1 parent 28bc891
commit d250d04
Show file tree

Hide file tree

Showing 30 changed files with 208 additions and 157 deletions.
diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.70.8",
-    "@cornerstonejs/core": "^1.70.8",
+    "@cornerstonejs/adapters": "^1.70.9",
+    "@cornerstonejs/core": "^1.70.9",
     "@kitware/vtk.js": "30.3.3",
     "react-color": "^2.19.3"
   }

diff --git a/extensions/cornerstone-dicom-seg/src/utils/hydrationUtils.ts b/extensions/cornerstone-dicom-seg/src/utils/hydrationUtils.ts
@@ -138,7 +138,7 @@ function getUpdatedViewportsForSegmentation({
   const { hangingProtocolService, displaySetService, segmentationService, viewportGridService } =
     servicesManager.services;
 
-  const { viewports } = viewportGridService.getState();
+  const { viewports, isHangingProtocolLayout } = viewportGridService.getState();
 
   const viewport = getTargetViewport({ viewportId, viewportGridService });
   const targetViewportId = viewport.viewportOptions.viewportId;
@@ -153,7 +153,8 @@ function getUpdatedViewportsForSegmentation({
 
   const updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
     targetViewportId,
-    referenceDisplaySetInstanceUID
+    referenceDisplaySetInstanceUID,
+    isHangingProtocolLayout
   );
 
   viewports.forEach((viewport, viewportId) => {

diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json
@@ -46,9 +46,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.70.8",
-    "@cornerstonejs/core": "^1.70.8",
-    "@cornerstonejs/tools": "^1.70.8",
+    "@cornerstonejs/adapters": "^1.70.9",
+    "@cornerstonejs/core": "^1.70.9",
+    "@cornerstonejs/tools": "^1.70.9",
     "classnames": "^2.3.2"
   }
 }
diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json
@@ -42,9 +42,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/core": "^1.70.8",
-    "@cornerstonejs/streaming-image-volume-loader": "^1.70.8",
-    "@cornerstonejs/tools": "^1.70.8",
+    "@cornerstonejs/core": "^1.70.9",
+    "@cornerstonejs/streaming-image-volume-loader": "^1.70.9",
+    "@cornerstonejs/tools": "^1.70.9",
     "classnames": "^2.3.2"
   }
 }
diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json
@@ -38,7 +38,7 @@
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
-    "@cornerstonejs/dicom-image-loader": "^1.70.8",
+    "@cornerstonejs/dicom-image-loader": "^1.70.9",
     "@icr/polyseg-wasm": "^0.4.0",
     "@ohif/core": "3.8.0-beta.85",
     "@ohif/ui": "3.8.0-beta.85",
@@ -55,10 +55,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@cornerstonejs/adapters": "^1.70.8",
-    "@cornerstonejs/core": "^1.70.8",
-    "@cornerstonejs/streaming-image-volume-loader": "^1.70.8",
-    "@cornerstonejs/tools": "^1.70.8",
+    "@cornerstonejs/adapters": "^1.70.9",
+    "@cornerstonejs/core": "^1.70.9",
+    "@cornerstonejs/streaming-image-volume-loader": "^1.70.9",
+    "@cornerstonejs/tools": "^1.70.9",
     "@icr/polyseg-wasm": "^0.4.0",
     "@kitware/vtk.js": "30.3.3",
     "html2canvas": "^1.4.1",

diff --git a/extensions/cornerstone/src/hps/mpr.ts b/extensions/cornerstone/src/hps/mpr.ts
@@ -14,17 +14,7 @@ export const mpr: Types.HangingProtocol.Protocol = {
   numberOfPriorsReferenced: 0,
   protocolMatchingRules: [],
   imageLoadStrategy: 'nth',
-  callbacks: {
-    // Switches out of MPR mode when the layout change button is used
-    onLayoutChange: [
-      {
-        commandName: 'toggleHangingProtocol',
-        commandOptions: { protocolId: 'mpr' },
-        context: 'DEFAULT',
-      },
-    ],
-    // Turns off crosshairs when switching out of MPR mode
-  },
+  callbacks: {},
   displaySetSelectors: {
     activeDisplaySet: {
       seriesMatchingRules: [

diff --git a/extensions/cornerstone/src/initCornerstoneTools.js b/extensions/cornerstone/src/initCornerstoneTools.js
@@ -44,6 +44,7 @@ import ImageOverlayViewerTool from './tools/ImageOverlayViewerTool';
 export default function initCornerstoneTools(configuration = {}) {
   CrosshairsTool.isAnnotation = false;
   ReferenceLinesTool.isAnnotation = false;
+  AdvancedMagnifyTool.isAnnotation = false;
 
   init(configuration);
   addTool(PanTool);

diff --git a/extensions/default/src/Panels/PanelStudyBrowser.tsx b/extensions/default/src/Panels/PanelStudyBrowser.tsx
@@ -25,7 +25,8 @@ function PanelStudyBrowser({
   // doesn't have to have such an intense shape. This works well enough for now.
   // Tabs --> Studies --> DisplaySets --> Thumbnails
   const { StudyInstanceUIDs } = useImageViewer();
-  const [{ activeViewportId, viewports }, viewportGridService] = useViewportGrid();
+  const [{ activeViewportId, viewports, isHangingProtocolLayout }, viewportGridService] =
+    useViewportGrid();
   const [activeTabName, setActiveTabName] = useState('primary');
   const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState([
     ...StudyInstanceUIDs,
@@ -40,7 +41,8 @@ function PanelStudyBrowser({
     try {
       updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
         viewportId,
-        displaySetInstanceUID
+        displaySetInstanceUID,
+        isHangingProtocolLayout
       );
     } catch (error) {
       console.warn(error);

diff --git a/extensions/default/src/Toolbar/ToolbarLayoutSelector.tsx b/extensions/default/src/Toolbar/ToolbarLayoutSelector.tsx
@@ -58,6 +58,10 @@ const generateAdvancedPresets = ({ servicesManager }) => {
   }
   const displaySetInsaneUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewportId);
 
+  if (!displaySetInsaneUIDs) {
+    return [];
+  }
+
   const displaySets = displaySetInsaneUIDs.map(uid => displaySetService.getDisplaySetByUID(uid));
 
   return hangingProtocols

diff --git a/extensions/default/src/commandsModule.ts b/extensions/default/src/commandsModule.ts
@@ -286,6 +286,7 @@ const commandsModule = ({
         const findOrCreateViewport = layoutFindOrCreate.bind(
           null,
           hangingProtocolService,
+          isHangingProtocolLayout,
           stateReduce.viewportsByPosition
         );
 
@@ -303,7 +304,7 @@ const commandsModule = ({
 
     toggleOneUp() {
       const viewportGridState = viewportGridService.getState();
-      const { activeViewportId, viewports, layout } = viewportGridState;
+      const { activeViewportId, viewports, layout, isHangingProtocolLayout } = viewportGridState;
       const { displaySetInstanceUIDs, displaySetOptions, viewportOptions } =
         viewports.get(activeViewportId);
 
@@ -330,7 +331,8 @@ const commandsModule = ({
                 .map(displaySetInstanceUID =>
                   hangingProtocolService.getViewportsRequireUpdate(
                     viewportIdToUpdate,
-                    displaySetInstanceUID
+                    displaySetInstanceUID,
+                    isHangingProtocolLayout
                   )
                 )
                 .flat();
@@ -511,7 +513,8 @@ const commandsModule = ({
 
       currentDisplaySets.sort(dsSortFn);
 
-      const { activeViewportId, viewports } = viewportGridService.getState();
+      const { activeViewportId, viewports, isHangingProtocolLayout } =
+        viewportGridService.getState();
 
       const { displaySetInstanceUIDs } = viewports.get(activeViewportId);
 
@@ -545,7 +548,8 @@ const commandsModule = ({
       try {
         updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
           activeViewportId,
-          displaySetInstanceUID
+          displaySetInstanceUID,
+          isHangingProtocolLayout
         );
       } catch (error) {
         console.warn(error);

diff --git a/extensions/default/src/findViewportsByPosition.ts b/extensions/default/src/findViewportsByPosition.ts
@@ -16,6 +16,7 @@ import { StateSyncService } from '@ohif/core';
  */
 export const findOrCreateViewport = (
   hangingProtocolService,
+  isHangingProtocolLayout,
   viewportsByPosition,
   position: number,
   positionId: string,
@@ -31,8 +32,13 @@ export const findOrCreateViewport = (
   if (!options.inDisplay) {
     options.inDisplay = [...viewportsByPosition.initialInDisplay];
   }
-  // See if there is a default viewport for new views.
-  const missing = hangingProtocolService.getMissingViewport(protocolId, stageIndex, options);
+
+  // See if there is a default viewport for new views
+  const missing = hangingProtocolService.getMissingViewport(
+    isHangingProtocolLayout ? protocolId : 'default',
+    stageIndex,
+    options
+  );
   if (missing) {
     const displaySetInstanceUIDs = missing.displaySetsInfo.map(it => it.displaySetInstanceUID);
     options.inDisplay.push(...displaySetInstanceUIDs);

diff --git a/extensions/default/src/getSopClassHandlerModule.js b/extensions/default/src/getSopClassHandlerModule.js
@@ -37,6 +37,8 @@ function getDisplaySetInfo(instances) {
   const { isDynamicVolume, timePoints } = dynamicVolumeInfo;
   let displaySetInfo;
 
+  const { appConfig } = appContext;
+
   if (isDynamicVolume) {
     const timePoint = timePoints[0];
     const instancesMap = new Map();
@@ -46,9 +48,9 @@ function getDisplaySetInfo(instances) {
 
     const firstTimePointInstances = timePoint.map(imageId => instancesMap.get(imageId));
 
-    displaySetInfo = isDisplaySetReconstructable(firstTimePointInstances);
+    displaySetInfo = isDisplaySetReconstructable(firstTimePointInstances, appConfig);
   } else {
-    displaySetInfo = isDisplaySetReconstructable(instances);
+    displaySetInfo = isDisplaySetReconstructable(instances, appConfig);
   }
 
   return {

diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json
@@ -32,8 +32,8 @@
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^1.70.8",
-    "@cornerstonejs/tools": "^1.70.8",
+    "@cornerstonejs/core": "^1.70.9",
+    "@cornerstonejs/tools": "^1.70.9",
     "@ohif/core": "3.8.0-beta.85",
     "@ohif/extension-cornerstone-dicom-sr": "3.8.0-beta.85",
     "@ohif/ui": "3.8.0-beta.85",

diff --git a/...s/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx b/...s/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.tsx
@@ -34,7 +34,8 @@ function PanelStudyBrowserTracking({
   // doesn't have to have such an intense shape. This works well enough for now.
   // Tabs --> Studies --> DisplaySets --> Thumbnails
   const { StudyInstanceUIDs } = useImageViewer();
-  const [{ activeViewportId, viewports }, viewportGridService] = useViewportGrid();
+  const [{ activeViewportId, viewports, isHangingProtocolLayout }, viewportGridService] =
+    useViewportGrid();
   const [trackedMeasurements, sendTrackedMeasurementsEvent] = useTrackedMeasurements();
   const [activeTabName, setActiveTabName] = useState('primary');
   const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState([
@@ -51,7 +52,8 @@ function PanelStudyBrowserTracking({
     try {
       updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
         viewportId,
-        displaySetInstanceUID
+        displaySetInstanceUID,
+        isHangingProtocolLayout
       );
     } catch (error) {
       console.warn(error);

diff --git a/modes/basic-test-mode/src/moreTools.ts b/modes/basic-test-mode/src/moreTools.ts
@@ -138,8 +138,8 @@ const moreTools = [
         createButton({
           id: 'Magnify',
           icon: 'tool-magnify',
-          label: 'Magnify',
-          tooltip: 'Magnify',
+          label: 'Zoom-in',
+          tooltip: 'Zoom-in',
           commands: setToolActiveToolbar,
           evaluate: 'evaluate.cornerstoneTool',
         }),
@@ -169,8 +169,8 @@ const moreTools = [
         createButton({
           id: 'AdvancedMagnify',
           icon: 'icon-tool-loupe',
-          label: 'Loupe',
-          tooltip: 'Loupe',
+          label: 'Magnify Probe',
+          tooltip: 'Magnify Probe',
           commands: 'toggleActiveDisabledToolbar',
           evaluate: 'evaluate.cornerstoneTool.toggle.ifStrictlyDisabled',
         }),

diff --git a/modes/longitudinal/src/moreTools.ts b/modes/longitudinal/src/moreTools.ts
@@ -138,8 +138,8 @@ const moreTools = [
         createButton({
           id: 'Magnify',
           icon: 'tool-magnify',
-          label: 'Magnify',
-          tooltip: 'Magnify',
+          label: 'Zoom-in',
+          tooltip: 'Zoom-in',
           commands: setToolActiveToolbar,
           evaluate: 'evaluate.cornerstoneTool',
         }),
@@ -161,8 +161,8 @@ const moreTools = [
         createButton({
           id: 'AdvancedMagnify',
           icon: 'icon-tool-loupe',
-          label: 'Loupe',
-          tooltip: 'Loupe',
+          label: 'Magnify Probe',
+          tooltip: 'Magnify Probe',
           commands: 'toggleActiveDisabledToolbar',
           evaluate: 'evaluate.cornerstoneTool.toggle.ifStrictlyDisabled',
         }),

diff --git a/modes/segmentation/src/toolbarButtons.ts b/modes/segmentation/src/toolbarButtons.ts
@@ -207,8 +207,8 @@ const toolbarButtons: Button[] = [
         createButton({
           id: 'Magnify',
           icon: 'tool-magnify',
-          label: 'Magnify',
-          tooltip: 'Magnify',
+          label: 'Zoom-in',
+          tooltip: 'Zoom-in',
           commands: setToolActiveToolbar,
           evaluate: 'evaluate.cornerstoneTool',
         }),
@@ -238,8 +238,8 @@ const toolbarButtons: Button[] = [
         createButton({
           id: 'AdvancedMagnify',
           icon: 'icon-tool-loupe',
-          label: 'Loupe',
-          tooltip: 'Loupe',
+          label: 'Magnify Probe',
+          tooltip: 'Magnify Probe',
           commands: 'toggleActiveDisabledToolbar',
           evaluate: 'evaluate.cornerstoneTool.toggle.ifStrictlyDisabled',
         }),

diff --git a/platform/app/cypress/integration/study-list/OHIFStudyList.spec.js b/platform/app/cypress/integration/study-list/OHIFStudyList.spec.js
@@ -47,6 +47,8 @@ describe('OHIF Study List', function () {
         '[data-cy="mode-basic-test-1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1"]'
       ).click();
       cy.get('[data-cy="return-to-work-list"]').click();
+      cy.wait(2000);
+
       cy.get('@searchResult2').should($list => {
         expect($list.length).to.be.eq(1);
         expect($list).to.contain('Juno');
@@ -72,6 +74,8 @@ describe('OHIF Study List', function () {
         '[data-cy="mode-basic-test-1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1"]'
       ).click();
       cy.get('[data-cy="return-to-work-list"]').click();
+      cy.wait(2000);
+
       cy.get('@searchResult2').should($list => {
         expect($list.length).to.be.eq(1);
         expect($list).to.contain('0000003');
@@ -82,6 +86,7 @@ describe('OHIF Study List', function () {
       cy.get('@AccessionNumber').type('321');
       //Wait result list to be displayed
       cy.waitStudyList();
+      cy.wait(2000);
       cy.get('@searchResult2').should($list => {
         expect($list.length).to.be.eq(1);
         expect($list).to.contain('321');
@@ -92,11 +97,15 @@ describe('OHIF Study List', function () {
       cy.get('@AccessionNumber').type('0000155811');
       //Wait result list to be displayed
       cy.waitStudyList();
+      cy.wait(2000);
+
       cy.get('[data-cy="studyRow-1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1"]').click();
       cy.get(
         '[data-cy="mode-basic-test-1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1"]'
       ).click();
       cy.get('[data-cy="return-to-work-list"]').click();
+      cy.wait(2000);
+
       cy.get('@searchResult2').should($list => {
         expect($list.length).to.be.eq(1);
         expect($list).to.contain('0000155811');
@@ -107,6 +116,8 @@ describe('OHIF Study List', function () {
       cy.get('@StudyDescription').type('PETCT');
       //Wait result list to be displayed
       cy.waitStudyList();
+      cy.wait(2000);
+
       cy.get('@searchResult2').should($list => {
         expect($list.length).to.be.eq(1);
         expect($list).to.contain('PETCT');
@@ -117,13 +128,15 @@ describe('OHIF Study List', function () {
       cy.get('@StudyDescription').type('PETCT');
       //Wait result list to be displayed
       cy.waitStudyList();
+      cy.wait(2000);
+
       cy.get('[data-cy="studyRow-1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1"]').click();
       cy.get(
         '[data-cy="mode-basic-test-1.3.6.1.4.1.25403.345050719074.3824.20170125113417.1"]'
       ).click();
       cy.get('[data-cy="return-to-work-list"]').click();
+      cy.wait(2000);
 
-      cy.wait(1000);
       cy.get('@searchResult2').should($list => {
         expect($list.length).to.be.eq(1);
         expect($list).to.contain('PETCT');