Compare commits

..

No commits in common. "23fb7be52b230a3dd2425674653eb3e7f9f5edd5" and "52bb39d6c2ca6895947cda1eebd36d7997c9a428" have entirely different histories.

4 changed files with 5 additions and 44 deletions

View File

@ -80,7 +80,7 @@
import * as cornerstone from 'cornerstone-core'
import * as cornerstoneMath from 'cornerstone-math'
import * as cornerstoneTools from 'cornerstone-tools'
import metaDataProvider, { registerImageSharedCacheKey, unregisterImageSharedCacheKeys } from '@/utils/metaDataProvider'
import metaDataProvider from '@/utils/metaDataProvider'
const scroll = cornerstoneTools.import('util/scrollToIndex')
import Hammer from 'hammerjs'
@ -211,9 +211,6 @@ export default {
this.stackScrollCallback
)
},
beforeDestroy() {
unregisterImageSharedCacheKeys(this.stack?.imageIds)
},
methods: {
loadImageStack(dicomSeries, text = '') {
@ -403,10 +400,6 @@ export default {
},
onNewImage(e) {
e.detail.enabledElement.options = {}
registerImageSharedCacheKey(
e.detail.image?.imageId,
e.detail.image?.sharedCacheKey
)
var data = e.detail.image.data
this.dicomInfo.hospital = data.string('x00080080')
// let instanceInfo = this.series.instanceInfoList.find(item => item.ImageId === e.detail.image.imageId)

View File

@ -119,25 +119,6 @@ function parseImageId(imageId) {
return { scheme, url, frame };
}
const imageIdToSharedCacheKey = new Map();
export function registerImageSharedCacheKey(imageId, sharedCacheKey) {
if (!imageId || !sharedCacheKey) {
return;
}
imageIdToSharedCacheKey.set(imageId, sharedCacheKey);
}
export function unregisterImageSharedCacheKeys(imageIds) {
if (!Array.isArray(imageIds) || imageIds.length === 0) {
return;
}
imageIds.forEach((imageId) => {
if (imageId) {
imageIdToSharedCacheKey.delete(imageId);
}
});
}
function getNumberValues(dataSet, tag, minimumLength) {
const values = [];
const valueAsString = dataSet.string(tag);
@ -276,20 +257,10 @@ function getSpacingBetweenSlices(dataSet) {
}
function metaDataProvider(type, imageId) {
const parsedImageId = parseImageId(imageId);
let dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(
const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(
parsedImageId.url
);
if (!dataSet) {
const sharedCacheKey = imageIdToSharedCacheKey.get(imageId);
if (sharedCacheKey) {
dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(
sharedCacheKey
);
}
}
if (!dataSet) {
return;
}
@ -450,6 +421,7 @@ function metaDataProvider(type, imageId) {
let columnPixelSpacing = null;
let rowPixelSpacing = null;
if (pixelSpacing) {
rowPixelSpacing = pixelSpacing[0];
columnPixelSpacing = pixelSpacing[1];

View File

@ -133,7 +133,7 @@ import { mapGetters } from 'vuex'
import Contextmenu from 'vue-contextmenujs'
Vue.use(Contextmenu)
import * as cornerstone from 'cornerstone-core'
import metaDataProvider, { registerImageSharedCacheKey, unregisterImageSharedCacheKeys } from '@/utils/metaDataProvider'
import metaDataProvider from '@/utils/metaDataProvider'
import * as cornerstoneMath from 'cornerstone-math'
import * as cornerstoneTools from 'cornerstone-tools'
@ -480,7 +480,6 @@ export default {
},
beforeDestroy() {
// Store.$off('getMeasureData')
unregisterImageSharedCacheKeys(this.stack?.imageIds)
DicomEvent.$off('setReadingState')
},
methods: {
@ -1280,7 +1279,6 @@ export default {
this.resetHideMeasureArr()
}
const { image } = e.detail
registerImageSharedCacheKey(image?.imageId, image?.sharedCacheKey)
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
const imageId = image.imageId
ToolStateManager.clearImageIdToolState(imageId)

View File

@ -126,7 +126,7 @@ import { mapGetters } from 'vuex'
import Contextmenu from 'vue-contextmenujs'
Vue.use(Contextmenu)
import * as cornerstone from 'cornerstone-core'
import metaDataProvider, { registerImageSharedCacheKey, unregisterImageSharedCacheKeys } from '@/utils/metaDataProvider'
import metaDataProvider from '@/utils/metaDataProvider'
import * as cornerstoneMath from 'cornerstone-math'
import * as cornerstoneTools from 'cornerstone-tools'
@ -473,7 +473,6 @@ export default {
},
beforeDestroy() {
// Store.$off('getMeasureData')
unregisterImageSharedCacheKeys(this.stack?.imageIds)
DicomEvent.$off('setReadingState')
DicomEvent.$off('updateImage')
},
@ -1187,7 +1186,6 @@ export default {
this.resetHideMeasureArr()
}
const { image } = e.detail
registerImageSharedCacheKey(image?.imageId, image?.sharedCacheKey)
const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
const imageId = image.imageId
ToolStateManager.clearImageIdToolState(imageId)