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

Move towards NPM for Cornerstone dependencies

Browse Source
This commit is contained in:
Erik Ziegler committed 2017-06-15 09:18:54 +02:00
1 parent 6c98c6a589
commit ddef3c4710
59 files changed
+2435 -29162
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js
-1
View File
@@ -7,7 +7,6 @@ import { getInstanceClassDefaultViewport } from '../instanceClassSpecificViewpor
export class ResizeViewportManager {
constructor() {
this._resizeHandler = null;
OHIF.log.info('ResizeViewportManager');
}
// Reposition Study Series Quick Switch based whether side bars are opened or not
Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js
+6 -6
View File
@@ -118,12 +118,12 @@ class DICOMFileLoadingListener extends BaseLoadingListener {
this.stopListening();
$(cornerstone).on(imageLoadProgressEventName, imageLoadProgressEventHandle);
$(cornerstone.events).on(imageLoadProgressEventName, imageLoadProgressEventHandle);
}
stopListening() {
const imageLoadProgressEventName = this._getImageLoadProgressEventName();
$(cornerstone).off(imageLoadProgressEventName);
$(cornerstone.events).off(imageLoadProgressEventName);
}
_imageLoadProgressEventHandle(e, eventData) {
@@ -241,16 +241,16 @@ class StackLoadingListener extends BaseLoadingListener {
this.stopListening();
$(cornerstone).on(imageLoadedEventName, imageLoadedEventHandle);
$(cornerstone).on(imageCachePromiseRemovedEventName, imageCachePromiseRemovedEventHandle);
$(cornerstone.events).on(imageLoadedEventName, imageLoadedEventHandle);
$(cornerstone.events).on(imageCachePromiseRemovedEventName, imageCachePromiseRemovedEventHandle);
}
stopListening() {
const imageLoadedEventName = this._getImageLoadedEventName();
const imageCachePromiseRemovedEventName = this._getImageCachePromiseRemoveEventName();
$(cornerstone).off(imageLoadedEventName);
$(cornerstone).off(imageCachePromiseRemovedEventName);
$(cornerstone.events).off(imageLoadedEventName);
$(cornerstone.events).off(imageCachePromiseRemovedEventName);
}
_updateFrameStatus(imageId, loaded) {
Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js
+7 -3
View File
@@ -13,12 +13,12 @@ export class StudyPrefetcher {
this.prefetchDisplaySetsTimeout = 300;
this.lastActiveViewportElement = null;
$(cornerstone).on('CornerstoneImageCacheFull.StudyPrefetcher', _.bind(this.cacheFullHandler, this));
$(cornerstone.events).on('CornerstoneImageCacheFull.StudyPrefetcher', _.bind(this.cacheFullHandler, this));
}
destroy() {
this.stopPrefetching();
$(cornerstone).off('CornerstoneImageCacheFull.StudyPrefetcher');
$(cornerstone.events).off('CornerstoneImageCacheFull.StudyPrefetcher');
}
static getInstance() {
@@ -162,7 +162,7 @@ export class StudyPrefetcher {
getStudy(image) {
const studyMetadata = cornerstoneTools.metaData.get('study', image.imageId);
return _.find(this.studies, study => study.studyInstanceUid === studyMetadata.studyInstanceUid);
return OHIF.viewer.Studies.find(study => study.studyInstanceUid === studyMetadata.studyInstanceUid);
}
getSeries(study, image) {
@@ -191,6 +191,10 @@ export class StudyPrefetcher {
}
const study = this.getStudy(image);
if (!study.seriesList || !study.seriesList.length) {
console.error(study);
}
const series = this.getSeries(study, image);
const instance = this.getInstance(series, image);
const displaySets = study.displaySets;