From 6ee5094cbe0fdf5470ab67e5706f3ba41b0d7b76 Mon Sep 17 00:00:00 2001 From: "James A. Petts" Date: Thu, 10 Oct 2019 16:57:53 +0100 Subject: [PATCH] =?UTF-8?q?perf:=20=E2=9A=A1=EF=B8=8F=20Update=20react-vtk?= =?UTF-8?q?js-viewport=20for=20performance=20improvement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/vtk/package.json | 2 +- extensions/vtk/src/OHIFVTKViewport.js | 8 +++++--- yarn.lock | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json index 3ef1a5a86..b58ff484f 100644 --- a/extensions/vtk/package.json +++ b/extensions/vtk/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@babel/runtime": "^7.5.5", - "react-vtkjs-viewport": "0.1.4" + "react-vtkjs-viewport": "^0.1.6" }, "devDependencies": { "@ohif/core": "^1.2.0", diff --git a/extensions/vtk/src/OHIFVTKViewport.js b/extensions/vtk/src/OHIFVTKViewport.js index 3a6e53e71..5bf3dd2c2 100644 --- a/extensions/vtk/src/OHIFVTKViewport.js +++ b/extensions/vtk/src/OHIFVTKViewport.js @@ -153,7 +153,7 @@ class OHIFVTKViewport extends Component { switch (sopClassUid) { case SOP_CLASSES.SEGMENTATION_STORAGE: throw new Error('Not yet implemented'); - + /* const data = handleSegmentationStorage( stack.imageIds, displaySetInstanceUid @@ -168,10 +168,13 @@ class OHIFVTKViewport extends Component { labelmap: labelmapDataObject, }; }); + */ default: imageDataObject = getImageData(stack.imageIds, displaySetInstanceUid); - return loadImageData(imageDataObject).then(() => { + const loadImageDataPromise = loadImageData(imageDataObject); + + return loadImageDataPromise.then(() => { return { data: imageDataObject.vtkImageData, }; @@ -265,7 +268,6 @@ class OHIFVTKViewport extends Component { } componentWillUnmount() { - console.log(this.props.viewportIndex); vtkViewportSubscriptionManager.unsubscribe(this.props.viewportIndex); } diff --git a/yarn.lock b/yarn.lock index a974bd44f..babd5769c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14969,10 +14969,10 @@ react-transition-group@^4.1.1: loose-envify "^1.4.0" prop-types "^15.6.2" -react-vtkjs-viewport@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.1.4.tgz#f5ecc7dd52ab065d54656f36851f49b058ba683f" - integrity sha512-07hVFJJ9LTy+Z9dgdPiPkaohVb013bgjNgH29MVafnjwH92YOXJzfFbf8/yzzVIZsYCETFf7rVw+oMGQJs5TAA== +react-vtkjs-viewport@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/react-vtkjs-viewport/-/react-vtkjs-viewport-0.1.6.tgz#d9bfb2c27c850c21c07c587405d0d3edcbd31d45" + integrity sha512-NO5Dx7MXnS6NTG+crIwcGlm1uBFYMTR/tXtLKfTfPwWNakazkqlUuhqpsw2dEcMqEB+v/RmAX6bzrArcjv4M4A== dependencies: date-fns "^2.2.1" gl-matrix "^3.1.0"