From 63e678a7473941f18aa11a4425dae9148fdcca05 Mon Sep 17 00:00:00 2001 From: "James A. Petts" Date: Wed, 9 Oct 2019 10:38:12 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20ReferenceError:=20fracToD?= =?UTF-8?q?ec=20is=20not=20defined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: Closes #50 --- examples/VTKBasicExample.js | 7 +++++-- src/lib/data/insertSlice.js | 17 +++++++++++++++-- src/lib/loadImageData.js | 13 ------------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/examples/VTKBasicExample.js b/examples/VTKBasicExample.js index ded1271d..88a315e4 100644 --- a/examples/VTKBasicExample.js +++ b/examples/VTKBasicExample.js @@ -12,11 +12,11 @@ import vtkVolumeMapper from 'vtk.js/Sources/Rendering/Core/VolumeMapper'; const PRESETS = { BONE: { windowWidth: 100, - windowCenter: 500, + windowCenter: 500 + 1024, // TODO: The data we load is unscaled, so we need to move our preset. }, HEAD: { windowWidth: 1000, - windowCenter: 300, + windowCenter: 300 + 1024, // TODO: The data we load is unscaled, so we need to move our preset. }, }; class VTKBasicExample extends Component { @@ -51,6 +51,9 @@ class VTKBasicExample extends Component { const volume = this.state.volumes[0]; const rgbTransferFunction = volume.getProperty().getRGBTransferFunction(0); + + this.state.volume; + const low = voi.windowCenter - voi.windowWidth / 2; const high = voi.windowCenter + voi.windowWidth / 2; diff --git a/src/lib/data/insertSlice.js b/src/lib/data/insertSlice.js index aa5d2267..6dece591 100644 --- a/src/lib/data/insertSlice.js +++ b/src/lib/data/insertSlice.js @@ -91,12 +91,12 @@ function _getScalingFunctionForModality(image) { } const acquisitionTimeInSeconds = - fracToDec(seriesAcquisitionTime.fractionalSeconds || 0) + + _fracToDec(seriesAcquisitionTime.fractionalSeconds || 0) + seriesAcquisitionTime.seconds + seriesAcquisitionTime.minutes * 60 + seriesAcquisitionTime.hours * 60 * 60; const injectionStartTimeInSeconds = - fracToDec(startTime.fractionalSeconds) + + _fracToDec(startTime.fractionalSeconds) + startTime.seconds + startTime.minutes * 60 + startTime.hours * 60 * 60; @@ -120,3 +120,16 @@ function _getSUV(slope, intercept, patientWeight, correctedDose, pixel) { function _getModalityScaledPixel(slope, intercept, pixel) { return pixel * slope + intercept; } + +/** + * Returns a decimal value given a fractional value. + * @private + * @method + * @name _fracToDec + * + * @param {number} fractionalValue The value to convert. + * @returns {number} The value converted to decimal. + */ +function _fracToDec(fractionalValue) { + return parseFloat(`.${fractionalValue}`); +} diff --git a/src/lib/loadImageData.js b/src/lib/loadImageData.js index 48174ccb..62a63f4a 100644 --- a/src/lib/loadImageData.js +++ b/src/lib/loadImageData.js @@ -27,19 +27,6 @@ function loadImageDataProgressively(imageIds, imageData, metaDataMap, zAxis) { return Promise.all(loadImagePromises); } -/** - * Returns a decimal value given a fractional value. - * @private - * @method - * @name fracToDec - * - * @param {number} fractionalValue The value to convert. - * @returns {number} The value converted to decimal. - */ -function fracToDec(fractionalValue) { - return parseFloat(`.${fractionalValue}`); -} - export default function loadImageData(imageDataObject) { return loadImageDataProgressively( imageDataObject.imageIds,