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

Merge pull request #1025 from JamesAPetts/vtkjsViewportPerformance

Browse Source 
perf: ⚡️ Update react-vtkjs-viewport for performance improvement
This commit is contained in:
James Petts 2019-10-10 17:37:34 +01:00 committed by GitHub
commit 750a150644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/vtk/package.json
View File

@ -48,7 +48,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.5.5", "@babel/runtime": "^7.5.5",
"react-vtkjs-viewport": "0.1.4" "react-vtkjs-viewport": "^0.1.6"
}, },
"devDependencies": { "devDependencies": {
"@ohif/core": "^1.2.0", "@ohif/core": "^1.2.0",

8
extensions/vtk/src/OHIFVTKViewport.js
View File

@ -153,7 +153,7 @@ class OHIFVTKViewport extends Component {
switch (sopClassUid) { switch (sopClassUid) {
case SOP_CLASSES.SEGMENTATION_STORAGE: case SOP_CLASSES.SEGMENTATION_STORAGE:
throw new Error('Not yet implemented'); throw new Error('Not yet implemented');
/*
const data = handleSegmentationStorage( const data = handleSegmentationStorage(
stack.imageIds, stack.imageIds,
displaySetInstanceUid displaySetInstanceUid
@ -168,10 +168,13 @@ class OHIFVTKViewport extends Component {
labelmap: labelmapDataObject, labelmap: labelmapDataObject,
}; };
}); });
*/
default: default:
imageDataObject = getImageData(stack.imageIds, displaySetInstanceUid); imageDataObject = getImageData(stack.imageIds, displaySetInstanceUid);
return loadImageData(imageDataObject).then(() => { const loadImageDataPromise = loadImageData(imageDataObject);
return loadImageDataPromise.then(() => {
return { return {
data: imageDataObject.vtkImageData, data: imageDataObject.vtkImageData,
}; };
@ -265,7 +268,6 @@ class OHIFVTKViewport extends Component {
} }
componentWillUnmount() { componentWillUnmount() {
console.log(this.props.viewportIndex);
vtkViewportSubscriptionManager.unsubscribe(this.props.viewportIndex); vtkViewportSubscriptionManager.unsubscribe(this.props.viewportIndex);
} }

8
yarn.lock
View File

@ -15078,10 +15078,10 @@ react-transition-group@^4.1.1:
loose-envify "^1.4.0" loose-envify "^1.4.0"
prop-types "^15.6.2" prop-types "^15.6.2"
react-vtkjs-viewport@0.1.4: react-vtkjs-viewport@^0.1.6:
version "0.1.4" version "0.1.6"
resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.1.4.tgz#f5ecc7dd52ab065d54656f36851f49b058ba683f" resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.1.6.tgz#d9bfb2c27c850c21c07c587405d0d3edcbd31d45"
integrity sha512-07hVFJJ9LTy+Z9dgdPiPkaohVb013bgjNgH29MVafnjwH92YOXJzfFbf8/yzzVIZsYCETFf7rVw+oMGQJs5TAA== integrity sha512-NO5Dx7MXnS6NTG+crIwcGlm1uBFYMTR/tXtLKfTfPwWNakazkqlUuhqpsw2dEcMqEB+v/RmAX6bzrArcjv4M4A==
dependencies: dependencies:
date-fns "^2.2.1" date-fns "^2.2.1"
gl-matrix "^3.1.0" gl-matrix "^3.1.0"