Skip to content

Commit d191407

Browse files
committed
Copy rather than reference pyramid values
1 parent 97eac2b commit d191407

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/pyramid.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,8 @@ function _createTileLoadFunction ({
369369
)
370370
}
371371

372+
const studyInstanceUID = pyramid.metadata[z].StudyInstanceUID
373+
const seriesInstanceUID = pyramid.metadata[z].SeriesInstanceUID
372374
const path = pyramid.frameMappings[z][index]
373375
let src
374376
if (path != null) {
@@ -377,8 +379,8 @@ function _createTileLoadFunction ({
377379
src += client.wadoURL
378380
}
379381
src += (
380-
'/studies/' + pyramid.metadata[z].StudyInstanceUID +
381-
'/series/' + pyramid.metadata[z].SeriesInstanceUID +
382+
'/studies/' + studyInstanceUID +
383+
'/series/' + seriesInstanceUID +
382384
'/instances/' + path
383385
)
384386
}
@@ -393,8 +395,6 @@ function _createTileLoadFunction ({
393395
const sopClassUID = refImage.SOPClassUID
394396

395397
if (src != null) {
396-
const studyInstanceUID = dwc.utils.getStudyInstanceUIDFromUri(src)
397-
const seriesInstanceUID = dwc.utils.getSeriesInstanceUIDFromUri(src)
398398
const sopInstanceUID = dwc.utils.getSOPInstanceUIDFromUri(src)
399399
const frameNumbers = dwc.utils.getFrameNumbersFromUri(src)
400400

@@ -584,11 +584,11 @@ function _fitImagePyramid (pyramid, refPyramid) {
584584

585585
// Fit the pyramid levels to the reference image pyramid
586586
const fittedPyramid = {
587-
extent: refPyramid.extent,
588-
origins: refPyramid.origins,
589-
resolutions: refPyramid.resolutions,
590-
gridSizes: refPyramid.gridSizes,
591-
tileSizes: refPyramid.tileSizes,
587+
extent: [...refPyramid.extent],
588+
origins: [...refPyramid.origins],
589+
resolutions: [...refPyramid.resolutions],
590+
gridSizes: [...refPyramid.gridSizes],
591+
tileSizes: [...refPyramid.tileSizes],
592592
pixelSpacings: [],
593593
metadata: [],
594594
frameMappings: []
@@ -597,9 +597,9 @@ function _fitImagePyramid (pyramid, refPyramid) {
597597
const index = matchingLevelIndices.find(element => element[0] === i)
598598
if (index) {
599599
const j = index[1]
600-
fittedPyramid.gridSizes[i] = pyramid.gridSizes[j]
601-
fittedPyramid.tileSizes[i] = pyramid.tileSizes[j]
602-
fittedPyramid.pixelSpacings.push(pyramid.pixelSpacings[j])
600+
fittedPyramid.gridSizes[i] = [...pyramid.gridSizes[j]]
601+
fittedPyramid.tileSizes[i] = [...pyramid.tileSizes[j]]
602+
fittedPyramid.pixelSpacings.push([...pyramid.pixelSpacings[j]])
603603
fittedPyramid.metadata.push(pyramid.metadata[j])
604604
fittedPyramid.frameMappings.push(pyramid.frameMappings[j])
605605
} else {

0 commit comments

Comments
 (0)