fix(crosshairs): reset angle, position, and slabthickness for crosshairs when reset viewport tool is used (#4113)
Co-authored-by: Alireza <ar.sedghi@gmail.com>
This commit is contained in:
1 parent
1124c409e9
commit
73d9e99d5d
17 files changed
+200
-49
No files matched your search
@@ -46,8 +46,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.20.13",
|
||||
"@cornerstonejs/adapters": "^1.74.6",
|
||||
"@cornerstonejs/core": "^1.74.6",
|
||||
"@cornerstonejs/adapters": "^1.74.7",
|
||||
"@cornerstonejs/core": "^1.74.7",
|
||||
"@kitware/vtk.js": "30.4.1",
|
||||
"react-color": "^2.19.3"
|
||||
}
|
||||
|
||||
@@ -46,9 +46,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.20.13",
|
||||
"@cornerstonejs/adapters": "^1.74.6",
|
||||
"@cornerstonejs/core": "^1.74.6",
|
||||
"@cornerstonejs/tools": "^1.74.6",
|
||||
"@cornerstonejs/adapters": "^1.74.7",
|
||||
"@cornerstonejs/core": "^1.74.7",
|
||||
"@cornerstonejs/tools": "^1.74.7",
|
||||
"classnames": "^2.3.2"
|
||||
}
|
||||
}
|
||||
@@ -42,9 +42,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.20.13",
|
||||
"@cornerstonejs/core": "^1.74.6",
|
||||
"@cornerstonejs/streaming-image-volume-loader": "^1.74.6",
|
||||
"@cornerstonejs/tools": "^1.74.6",
|
||||
"@cornerstonejs/core": "^1.74.7",
|
||||
"@cornerstonejs/streaming-image-volume-loader": "^1.74.7",
|
||||
"@cornerstonejs/tools": "^1.74.7",
|
||||
"classnames": "^2.3.2"
|
||||
}
|
||||
}
|
||||
@@ -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.74.6",
|
||||
"@cornerstonejs/dicom-image-loader": "^1.74.7",
|
||||
"@icr/polyseg-wasm": "^0.4.0",
|
||||
"@ohif/core": "3.9.0-beta.16",
|
||||
"@ohif/ui": "3.9.0-beta.16",
|
||||
@@ -55,10 +55,10 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.20.13",
|
||||
"@cornerstonejs/adapters": "^1.74.6",
|
||||
"@cornerstonejs/core": "^1.74.6",
|
||||
"@cornerstonejs/streaming-image-volume-loader": "^1.74.6",
|
||||
"@cornerstonejs/tools": "^1.74.6",
|
||||
"@cornerstonejs/adapters": "^1.74.7",
|
||||
"@cornerstonejs/core": "^1.74.7",
|
||||
"@cornerstonejs/streaming-image-volume-loader": "^1.74.7",
|
||||
"@cornerstonejs/tools": "^1.74.7",
|
||||
"@icr/polyseg-wasm": "^0.4.0",
|
||||
"@kitware/vtk.js": "30.4.1",
|
||||
"html2canvas": "^1.4.1",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useState, useCallback } from 'react';
|
||||
import React, { useEffect, useState, useCallback, useRef } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { LayoutSelector as OHIFLayoutSelector, ToolbarButton, LayoutPreset } from '@ohif/ui';
|
||||
|
||||
@@ -134,22 +134,30 @@ function LayoutSelector({
|
||||
...rest
|
||||
}: withAppTypes) {
|
||||
const [isOpen, setIsOpen] = useState(false);
|
||||
const dropdownRef = useRef(null);
|
||||
|
||||
const { customizationService } = servicesManager.services;
|
||||
const commonPresets = customizationService.get('commonPresets') || defaultCommonPresets;
|
||||
const advancedPresets =
|
||||
customizationService.get('advancedPresets') || generateAdvancedPresets({ servicesManager });
|
||||
|
||||
const closeOnOutsideClick = () => {
|
||||
if (isOpen) {
|
||||
const closeOnOutsideClick = event => {
|
||||
if (isOpen && dropdownRef.current) {
|
||||
setIsOpen(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
window.addEventListener('click', closeOnOutsideClick);
|
||||
if (!isOpen) {
|
||||
return;
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
window.addEventListener('click', closeOnOutsideClick);
|
||||
}, 0);
|
||||
return () => {
|
||||
window.removeEventListener('click', closeOnOutsideClick);
|
||||
dropdownRef.current = null;
|
||||
};
|
||||
}, [isOpen]);
|
||||
|
||||
@@ -169,7 +177,10 @@ function LayoutSelector({
|
||||
disableToolTip={tooltipDisabled}
|
||||
dropdownContent={
|
||||
DropdownContent !== null && (
|
||||
<div className="flex ">
|
||||
<div
|
||||
className="flex"
|
||||
ref={dropdownRef}
|
||||
>
|
||||
<div className="bg-secondary-dark flex flex-col gap-2.5 p-2">
|
||||
<div className="text-aqua-pale text-xs">Common</div>
|
||||
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
"start": "yarn run dev"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@cornerstonejs/core": "^1.74.6",
|
||||
"@cornerstonejs/tools": "^1.74.6",
|
||||
"@cornerstonejs/core": "^1.74.7",
|
||||
"@cornerstonejs/tools": "^1.74.7",
|
||||
"@ohif/core": "3.9.0-beta.16",
|
||||
"@ohif/extension-cornerstone-dicom-sr": "3.9.0-beta.16",
|
||||
"@ohif/ui": "3.9.0-beta.16",
|
||||
|
||||
Reference in new issue
Block a user