othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tmtv): crosshairs should not have viewport indicators (#4197)

Browse Source
This commit is contained in:
Alireza 2024-05-31 11:14:55 -04:00 committed by GitHub
parent 6e6ecd8709
commit f85da32f34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/cornerstone-dicom-seg/package.json
View File

@ -46,8 +46,8 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.20.13", "@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^1.77.0", "@cornerstonejs/adapters": "^1.77.3",
"@cornerstonejs/core": "^1.77.0", "@cornerstonejs/core": "^1.77.3",
"@kitware/vtk.js": "30.4.1", "@kitware/vtk.js": "30.4.1",
"react-color": "^2.19.3" "react-color": "^2.19.3"
} }

6
extensions/cornerstone-dicom-sr/package.json
View File

@ -46,9 +46,9 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.20.13", "@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^1.77.0", "@cornerstonejs/adapters": "^1.77.3",
"@cornerstonejs/core": "^1.77.0", "@cornerstonejs/core": "^1.77.3",
"@cornerstonejs/tools": "^1.77.0", "@cornerstonejs/tools": "^1.77.3",
"classnames": "^2.3.2" "classnames": "^2.3.2"
} }
} }

6
extensions/cornerstone-dynamic-volume/package.json
View File

@ -42,9 +42,9 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.20.13", "@babel/runtime": "^7.20.13",
"@cornerstonejs/core": "^1.77.0", "@cornerstonejs/core": "^1.77.3",
"@cornerstonejs/streaming-image-volume-loader": "^1.77.0", "@cornerstonejs/streaming-image-volume-loader": "^1.77.3",
"@cornerstonejs/tools": "^1.77.0", "@cornerstonejs/tools": "^1.77.3",
"classnames": "^2.3.2" "classnames": "^2.3.2"
} }
} }

10
extensions/cornerstone/package.json
View File

@ -38,7 +38,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.2", "@cornerstonejs/codec-openjph": "^2.4.2",
"@cornerstonejs/dicom-image-loader": "^1.77.0", "@cornerstonejs/dicom-image-loader": "^1.77.3",
"@icr/polyseg-wasm": "^0.4.0", "@icr/polyseg-wasm": "^0.4.0",
"@ohif/core": "3.9.0-beta.31", "@ohif/core": "3.9.0-beta.31",
"@ohif/ui": "3.9.0-beta.31", "@ohif/ui": "3.9.0-beta.31",
@ -55,10 +55,10 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.20.13", "@babel/runtime": "^7.20.13",
"@cornerstonejs/adapters": "^1.77.0", "@cornerstonejs/adapters": "^1.77.3",
"@cornerstonejs/core": "^1.77.0", "@cornerstonejs/core": "^1.77.3",
"@cornerstonejs/streaming-image-volume-loader": "^1.77.0", "@cornerstonejs/streaming-image-volume-loader": "^1.77.3",
"@cornerstonejs/tools": "^1.77.0", "@cornerstonejs/tools": "^1.77.3",
"@icr/polyseg-wasm": "^0.4.0", "@icr/polyseg-wasm": "^0.4.0",
"@kitware/vtk.js": "30.4.1", "@kitware/vtk.js": "30.4.1",
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",

4
extensions/measurement-tracking/package.json
View File

@ -32,8 +32,8 @@
"start": "yarn run dev" "start": "yarn run dev"
}, },
"peerDependencies": { "peerDependencies": {
"@cornerstonejs/core": "^1.77.0", "@cornerstonejs/core": "^1.77.3",
"@cornerstonejs/tools": "^1.77.0", "@cornerstonejs/tools": "^1.77.3",
"@ohif/core": "3.9.0-beta.31", "@ohif/core": "3.9.0-beta.31",
"@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.31", "@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.31",
"@ohif/ui": "3.9.0-beta.31", "@ohif/ui": "3.9.0-beta.31",

14
extensions/tmtv/src/utils/hpViewports.ts
View File

@ -127,7 +127,7 @@ const ptAXIAL = {
source: true, source: true,
target: false, target: false,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],
@ -174,7 +174,7 @@ const ptSAGITTAL = {
source: true, source: true,
target: false, target: false,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],
@ -221,7 +221,7 @@ const ptCORONAL = {
source: true, source: true,
target: false, target: false,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],
@ -277,7 +277,7 @@ const fusionAXIAL = {
source: false, source: false,
target: true, target: true,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],
@ -343,7 +343,7 @@ const fusionSAGITTAL = {
source: false, source: false,
target: true, target: true,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],
@ -409,7 +409,7 @@ const fusionCORONAL = {
source: false, source: false,
target: true, target: true,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],
@ -460,7 +460,7 @@ const mipSAGITTAL = {
source: true, source: true,
target: false, target: false,
options: { options: {
syncInvertState: false, syncColormap: false,
}, },
}, },
], ],

2
modes/segmentation/src/toolbarButtons.ts
View File

@ -1,5 +1,5 @@
import type { Button } from '@ohif/core/types'; import type { Button } from '@ohif/core/types';
import { defaults, ToolbarService, ViewportGridService } from '@ohif/core'; import { ToolbarService, ViewportGridService } from '@ohif/core';
const { createButton } = ToolbarService; const { createButton } = ToolbarService;

2
modes/tmtv/src/index.ts
View File

@ -53,7 +53,6 @@ function modeFactory({ modeConfiguration }) {
customizationService, customizationService,
hangingProtocolService, hangingProtocolService,
displaySetService, displaySetService,
viewportGridService,
} = servicesManager.services; } = servicesManager.services;
const utilityModule = extensionManager.getModuleEntry( const utilityModule = extensionManager.getModuleEntry(
@ -97,7 +96,6 @@ function modeFactory({ modeConfiguration }) {
'WindowLevel', 'WindowLevel',
'Crosshairs', 'Crosshairs',
'Pan', 'Pan',
'SyncToggle',
]); ]);
toolbarService.createButtonSection('ROIThresholdToolbox', [ toolbarService.createButtonSection('ROIThresholdToolbox', [
'RectangleROIStartEndThreshold', 'RectangleROIStartEndThreshold',

6
modes/tmtv/src/initToolGroups.js
View File

@ -132,12 +132,6 @@ function _initToolGroups(
{ {
toolName: toolNames.Crosshairs, toolName: toolNames.Crosshairs,
configuration: { configuration: {
viewportIndicators: true,
viewportIndicatorsConfig: {
circleRadius: 5,
xOffset: 0.95,
yOffset: 0.05,
},
disableOnPassive: true, disableOnPassive: true,
autoPan: { autoPan: {
enabled: false, enabled: false,

2
platform/app/cypress/integration/ImageConsistency.spec.js
View File

@ -1,5 +1,3 @@
import { utilities } from '@cornerstonejs/core';
/** /**
* Add tests to ensure image consistency and quality * Add tests to ensure image consistency and quality
*/ */

2
platform/app/package.json
View File

@ -53,7 +53,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.5", "@cornerstonejs/codec-openjph": "^2.4.5",
"@cornerstonejs/dicom-image-loader": "^1.77.0", "@cornerstonejs/dicom-image-loader": "^1.77.3",
"@emotion/serialize": "^1.1.3", "@emotion/serialize": "^1.1.3",
"@ohif/core": "3.9.0-beta.31", "@ohif/core": "3.9.0-beta.31",
"@ohif/extension-cornerstone": "3.9.0-beta.31", "@ohif/extension-cornerstone": "3.9.0-beta.31",

2
platform/core/package.json
View File

@ -37,7 +37,7 @@
"@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
"@cornerstonejs/codec-openjpeg": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.2",
"@cornerstonejs/codec-openjph": "^2.4.2", "@cornerstonejs/codec-openjph": "^2.4.2",
"@cornerstonejs/dicom-image-loader": "^1.77.0", "@cornerstonejs/dicom-image-loader": "^1.77.3",
"@ohif/ui": "3.9.0-beta.31", "@ohif/ui": "3.9.0-beta.31",
"cornerstone-math": "0.1.9", "cornerstone-math": "0.1.9",
"dicom-parser": "^1.8.21" "dicom-parser": "^1.8.21"

2
platform/core/src/services/HangingProtocolService/HangingProtocolService.ts
View File

@ -1020,6 +1020,8 @@ export default class HangingProtocolService extends PubSubService {
if (this.registeredImageLoadStrategies[imageLoadStrategy] instanceof Function) { if (this.registeredImageLoadStrategies[imageLoadStrategy] instanceof Function) {
this.activeImageLoadStrategyName = imageLoadStrategy; this.activeImageLoadStrategyName = imageLoadStrategy;
} }
} else {
this.activeImageLoadStrategyName = null;
} }
this._updateStageStatus(options); this._updateStageStatus(options);

48
yarn.lock
View File

@ -2329,13 +2329,13 @@
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
"@cornerstonejs/adapters@^1.77.0": "@cornerstonejs/adapters@^1.77.3":
version "1.77.0" version "1.77.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.77.0.tgz#c94d7ff566c4036b79ded3501171e54bce5f7605" resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-1.77.3.tgz#3cac2b8747f437af98fb7a586473445d786ede69"
integrity sha512-VumgZgCZE60Q6iiEWdVqxKWviKihOg/DLYVOdid+xbhzYHkOIZDMS9wbMLTHy3MJTEEXG/ZhgWJ9Rv5yT93v2Q== integrity sha512-+Ik0SLgTzBfcAeys8naiNxXxS5N5+JVKfWzvDi5qDprsK4xXvcJZpfg0O/Ry6rO9kZpjnQl61CMiHaMzMmyERw==
dependencies: dependencies:
"@babel/runtime-corejs2" "^7.17.8" "@babel/runtime-corejs2" "^7.17.8"
"@cornerstonejs/tools" "^1.77.0" "@cornerstonejs/tools" "^1.77.3"
buffer "^6.0.3" buffer "^6.0.3"
dcmjs "^0.29.8" dcmjs "^0.29.8"
gl-matrix "^3.4.3" gl-matrix "^3.4.3"
@ -2382,10 +2382,10 @@
resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0" resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0"
integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg== integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg==
"@cornerstonejs/core@^1.77.0": "@cornerstonejs/core@^1.77.3":
version "1.77.0" version "1.77.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.77.0.tgz#c348b4318871c5f89e8fce8b35773eac5a3e3eaa" resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-1.77.3.tgz#e29455259ed151fbd772a24a7574414217a6675c"
integrity sha512-H6QZjHpExD948nYessEfc5DNHTSnF519YUk9Z/2wmt+yM+jmFmTtdkQQIt5Sy5mZ1vJ/47umldGdkU+pRX+XFQ== integrity sha512-QSu8TkIWc0lZBWbCByYhEySqmU8xleiqbQqQrgO9iMp2M4M+XOz8pIvox2WsQteqCLonZWMVI2T4J7q6osSX6A==
dependencies: dependencies:
"@kitware/vtk.js" "30.4.1" "@kitware/vtk.js" "30.4.1"
comlink "^4.4.1" comlink "^4.4.1"
@ -2393,34 +2393,34 @@
gl-matrix "^3.4.3" gl-matrix "^3.4.3"
lodash.clonedeep "4.5.0" lodash.clonedeep "4.5.0"
"@cornerstonejs/dicom-image-loader@^1.77.0": "@cornerstonejs/dicom-image-loader@^1.77.3":
version "1.77.0" version "1.77.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.77.0.tgz#2ede9252bdb1292aeacea37fc2f8e52438f10ff4" resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-1.77.3.tgz#90fb8407a20bd6f52b4e2921a2bd62e791810b07"
integrity sha512-OKUjSWBXNwSr2xv6EPyYFPu5omnQBOIkzQYAMr4bVA6/h9Nc7eWGRbb2ugBWH54RAraM8+9kn/zT1EwcYTBUPw== integrity sha512-b+ysKZvmA1+sFEb+6//GsjmhhPstsX4a7Gj7pflKGqX+8aPMQ+nF8zv3R0D26eAejoC9hGcaGupYlXfiVq7dBA==
dependencies: dependencies:
"@cornerstonejs/codec-charls" "^1.2.3" "@cornerstonejs/codec-charls" "^1.2.3"
"@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2"
"@cornerstonejs/codec-openjpeg" "^1.2.2" "@cornerstonejs/codec-openjpeg" "^1.2.2"
"@cornerstonejs/codec-openjph" "^2.4.5" "@cornerstonejs/codec-openjph" "^2.4.5"
"@cornerstonejs/core" "^1.77.0" "@cornerstonejs/core" "^1.77.3"
dicom-parser "^1.8.9" dicom-parser "^1.8.9"
pako "^2.0.4" pako "^2.0.4"
uuid "^9.0.0" uuid "^9.0.0"
"@cornerstonejs/streaming-image-volume-loader@^1.77.0": "@cornerstonejs/streaming-image-volume-loader@^1.77.3":
version "1.77.0" version "1.77.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.77.0.tgz#a98b469992d74c5a2b4276bafa5a2d386e8952dc" resolved "https://registry.yarnpkg.com/@cornerstonejs/streaming-image-volume-loader/-/streaming-image-volume-loader-1.77.3.tgz#6ce50784106282ab3db65a5561515b8c23b3411f"
integrity sha512-HoWMCB7PqCw+zRBlXwKX5mUNFrPBE6m8CJNunIkX+0XvZ8YHfs0G1SHomoKKKsFt5WMhBXmD+yU4UnoVq1ae8A== integrity sha512-HqJ+Qj8IfmR+0kpw+XXTKNs09WVzdAubmE41RR2i8b4BckT4qaY0EmYaAMlG+sxJtIVBsb4QnvQ6lXkRhjJW4w==
dependencies: dependencies:
"@cornerstonejs/core" "^1.77.0" "@cornerstonejs/core" "^1.77.3"
comlink "^4.4.1" comlink "^4.4.1"
"@cornerstonejs/tools@^1.77.0": "@cornerstonejs/tools@^1.77.3":
version "1.77.0" version "1.77.3"
resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.77.0.tgz#a8ff93208dd70a209dfedc28dab0011ffdfc87c4" resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-1.77.3.tgz#7a26df4a95ad7d25de272adf52da072f3717e4a0"
integrity sha512-vp7mZmXWR3v7m7J80V6hfrBTWLL2IjoQK15ws7StOZDTtX6waj1z0CRu70uOMR276xz3W2RsqTZQ6IFclmfcuw== integrity sha512-vUi0+2pSJ0xLwysj2mWMiFEZJ50ZAfU+5JjKly30aECxCfmURrhnEEOMsECwVxEeBGM5hHNc/Cl4SZGy87dV2Q==
dependencies: dependencies:
"@cornerstonejs/core" "^1.77.0" "@cornerstonejs/core" "^1.77.3"
"@icr/polyseg-wasm" "0.4.0" "@icr/polyseg-wasm" "0.4.0"
"@types/offscreencanvas" "2019.7.3" "@types/offscreencanvas" "2019.7.3"
comlink "^4.4.1" comlink "^4.4.1"