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

LT-375, LT-376: Update versions, Remove expectation of DICOM images from metaData provider

Browse Source
This commit is contained in:
Erik Ziegler 2016-11-18 11:32:15 +01:00
parent 6940b7d828
commit 666e626f05
9 changed files with 79 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OHIFViewer/.meteor/packages
View File

@ -18,9 +18,8 @@ twbs:bootstrap
http@1.2.10
arsnebula:reactive-promise
promise@0.8.8
stylus@2.513.6
stylus@2.513.8
fortawesome:fontawesome
mrt:moment@2.15.1
meteor-base@1.0.4
mobile-experience@1.0.4
mongo@1.1.14
@ -35,7 +34,7 @@ ejson@1.0.13
spacebars@1.0.12
check@1.2.4
aldeed:simple-schema # Third party package to deal with schemas
ecmascript@0.5.9
ecmascript@0.6.1
reactive-var@1.0.11
practicalmeteor:loglevel

2
OHIFViewer/.meteor/release
View File

@ -1 +1 @@
METEOR@1.4.2
METEOR@1.4.2.3

21
OHIFViewer/.meteor/versions
View File

@ -9,14 +9,14 @@ allow-deny@1.0.5
arsnebula:reactive-promise@0.9.1
autoupdate@1.3.12
babel-compiler@6.13.0
babel-runtime@0.1.13
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.2.0
blaze-html-templates@1.0.5
blaze-tools@1.0.10
boilerplate-generator@1.0.11
caching-compiler@1.1.8
caching-compiler@1.1.9
caching-html-compiler@1.0.7
callback-hook@1.0.10
check@1.2.4
@ -24,20 +24,20 @@ clinical:router@2.0.19
clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0
coffeescript@1.11.1_2
coffeescript@1.11.1_4
ddp@1.2.5
ddp-client@1.3.2
ddp-common@1.2.7
ddp-common@1.2.8
ddp-rate-limiter@1.0.6
ddp-server@1.3.11
ddp-server@1.3.12
deps@1.0.12
design@0.0.1
diff-sequence@1.0.7
ecmascript@0.5.9
ecmascript@0.6.1
ecmascript-runtime@0.3.15
ejson@1.0.13
fastclick@1.0.13
fortawesome:fontawesome@4.6.3
fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10
gilbertwat:bootstrap3-daterangepicker@1.3.21_1
hot-code-push@1.0.4
@ -61,15 +61,14 @@ meteor-base@1.0.4
meteor-platform@1.2.6
minifier-css@1.2.15
minifier-js@1.2.15
minimongo@1.0.18
minimongo@1.0.19
mobile-experience@1.0.4
mobile-status-bar@1.0.13
modules@0.7.7
modules-runtime@0.7.7
momentjs:moment@2.15.1
momentjs:moment@2.16.0
mongo@1.1.14
mongo-id@1.0.6
mrt:moment@2.8.1
natestrauser:select2@4.0.3
npm-mongo@2.2.11_2
observe-sequence@1.0.14
@ -103,7 +102,7 @@ spacebars-compiler@1.0.13
standard-app-packages@1.0.9
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
stylus@2.513.6
stylus@2.513.8
templating@1.2.15
templating-compiler@1.2.15
templating-runtime@1.2.15

1
Packages/ohif-study-list/package.js
View File

@ -16,7 +16,6 @@ Package.onUse(function(api) {
api.use('silentcicero:jszip');
api.use('aldeed:simple-schema');
api.use('accounts-base');
api.use('mrt:moment');
api.use('aldeed:collection2');
// Note: MomentJS appears to be required for Bootstrap3 Datepicker, but not a dependency for some reason

50
Packages/ohif-viewerbase/client/lib/metaDataProvider.js
View File

@ -72,6 +72,20 @@ addSpecificMetadata = function(imageId, type, data) {
metaDataLookup[imageId] = $.extend(metaDataLookup[imageId], metaData);
};
function getFromDataSet(dataSet, type, tag) {
if (!dataSet) {
return;
}
const fn = dataSet[type];
if (!fn) {
return;
}
return fn(tag);
}
/**
* Updates the related metaData for missing fields given a specified image
*
@ -83,29 +97,30 @@ updateMetaData = function(image) {
return;
}
imageMetaData.instance.sopClassUid = imageMetaData.instance.sopClassUid || image.data.string('x00080016');
imageMetaData.instance.sopInstanceUid = imageMetaData.instance.sopInstanceUid || image.data.string('x00080018');
imageMetaData.instance.rows = imageMetaData.instance.rows || image.rows;
imageMetaData.instance.columns = imageMetaData.instance.columns || image.columns;
imageMetaData.instance.pixelSpacing = imageMetaData.instance.pixelSpacing || image.data.string('x00280030');
imageMetaData.instance.frameOfReferenceUID = imageMetaData.instance.frameOfReferenceUID || image.data.string('x00200052');
imageMetaData.instance.imageOrientationPatient = imageMetaData.instance.imageOrientationPatient || image.data.string('x00200037');
imageMetaData.instance.imagePositionPatient = imageMetaData.instance.imagePositionPatient || image.data.string('x00200032');
imageMetaData.instance.sliceThickness = imageMetaData.instance.sliceThickness || image.data.string('x00180050');
imageMetaData.instance.sliceLocation = imageMetaData.instance.sliceLocation || image.data.string('x00201041');
imageMetaData.instance.tablePosition = imageMetaData.instance.tablePosition || image.data.string('x00189327');
imageMetaData.instance.spacingBetweenSlices = imageMetaData.instance.spacingBetweenSlices || image.data.string('x00180088');
imageMetaData.instance.sopClassUid = imageMetaData.instance.sopClassUid || getFromDataSet(image.data, 'string', 'x00080016');
imageMetaData.instance.sopInstanceUid = imageMetaData.instance.sopInstanceUid || getFromDataSet(image.data, 'string', 'x00080018');
imageMetaData.instance.lossyImageCompression = imageMetaData.instance.lossyImageCompression || image.data.string('x00282110');
imageMetaData.instance.lossyImageCompressionRatio = imageMetaData.instance.lossyImageCompressionRatio || image.data.string('x00282112');
imageMetaData.instance.pixelSpacing = imageMetaData.instance.pixelSpacing || getFromDataSet(image.data, 'string', 'x00280030');
imageMetaData.instance.frameOfReferenceUID = imageMetaData.instance.frameOfReferenceUID || getFromDataSet(image.data, 'string', 'x00200052');
imageMetaData.instance.imageOrientationPatient = imageMetaData.instance.imageOrientationPatient || getFromDataSet(image.data, 'string', 'x00200037');
imageMetaData.instance.imagePositionPatient = imageMetaData.instance.imagePositionPatient || getFromDataSet(image.data, 'string', 'x00200032');
imageMetaData.instance.frameIncrementPointer = imageMetaData.instance.frameIncrementPointer || image.data.string('x00280009');
imageMetaData.instance.frameTime = imageMetaData.instance.frameTime || image.data.string('x00181063');
imageMetaData.instance.frameTimeVector = imageMetaData.instance.frameTimeVector || image.data.string('x00181065');
imageMetaData.instance.sliceThickness = imageMetaData.instance.sliceThickness || getFromDataSet(image.data, 'string', 'x00180050');
imageMetaData.instance.sliceLocation = imageMetaData.instance.sliceLocation || getFromDataSet(image.data, 'string', 'x00201041');
imageMetaData.instance.tablePosition = imageMetaData.instance.tablePosition || getFromDataSet(image.data, 'string', 'x00189327');
imageMetaData.instance.spacingBetweenSlices = imageMetaData.instance.spacingBetweenSlices || getFromDataSet(image.data, 'string', 'x00180088');
if (!imageMetaData.instance.multiframeMetadata) {
imageMetaData.instance.lossyImageCompression = imageMetaData.instance.lossyImageCompression || getFromDataSet(image.data, 'string', 'x00282110');
imageMetaData.instance.lossyImageCompressionRatio = imageMetaData.instance.lossyImageCompressionRatio || getFromDataSet(image.data, 'string', 'x00282112');
imageMetaData.instance.frameIncrementPointer = imageMetaData.instance.frameIncrementPointer || getFromDataSet(image.data, 'string', 'x00280009');
imageMetaData.instance.frameTime = imageMetaData.instance.frameTime || getFromDataSet(image.data, 'string', 'x00181063');
imageMetaData.instance.frameTimeVector = imageMetaData.instance.frameTimeVector || getFromDataSet(image.data, 'string', 'x00181065');
if (image.data && !imageMetaData.instance.multiframeMetadata) {
imageMetaData.instance.multiframeMetadata = getMultiframeModuleMetaData(image.data);
}
@ -216,7 +231,6 @@ getMultiframeModuleMetaData = function(dataSet) {
}
return imageInfo;
};
/**

16
StandaloneViewer/StandaloneViewer/.meteor/packages
View File

@ -15,20 +15,22 @@ tracker@1.1.1 # Meteor's client-side reactive programming librar
standard-minifier-css@1.3.2 # CSS minifier run for production mode
standard-minifier-js@1.2.1 # JS minifier run for production mode
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.5.9 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.6.1 # Enable ECMAScript2015+ syntax in app code
shell-server@0.2.1 # Server-side component of the `meteor shell` command
cornerstone
dicomweb
# OHIF Packages
design
ohif:core
viewerbase
worklist
wadoproxy
ohif:cornerstone
ohif:viewerbase
ohif:study-list
ohif:dicom-services
ohif:hanging-protocols
# ohif:user-management
aldeed:template-extension
aldeed:simple-schema@1.5.3
stylus@2.513.6
stylus@2.513.8
clinical:router
session@1.1.7
practicalmeteor:loglevel

2
StandaloneViewer/StandaloneViewer/.meteor/release
View File

@ -1 +1 @@
METEOR@1.4.2
METEOR@1.4.2.3

42
StandaloneViewer/StandaloneViewer/.meteor/versions
View File

@ -1,17 +1,21 @@
accounts-base@1.2.14
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3
aldeed:template-extension@4.0.0
allow-deny@1.0.5
autoupdate@1.3.12
babel-compiler@6.13.0
babel-runtime@0.1.12
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.1.9
blaze@2.2.0
blaze-html-templates@1.0.5
blaze-tools@1.0.10
boilerplate-generator@1.0.11
caching-compiler@1.1.8
caching-compiler@1.1.9
caching-html-compiler@1.0.7
callback-hook@1.0.10
check@1.2.4
@ -19,24 +23,21 @@ clinical:router@2.0.19
clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0
coffeescript@1.11.1_2
cornerstone@0.0.1
coffeescript@1.11.1_4
ddp@1.2.5
ddp-client@1.3.2
ddp-common@1.2.7
ddp-common@1.2.8
ddp-rate-limiter@1.0.6
ddp-server@1.3.11
ddp-server@1.3.12
deps@1.0.12
design@0.0.1
dicomweb@0.0.1
diff-sequence@1.0.7
dimseservice@0.0.1
ecmascript@0.5.9
ecmascript@0.6.1
ecmascript-runtime@0.3.15
ejson@1.0.13
es5-shim@4.6.15
fastclick@1.0.13
fortawesome:fontawesome@4.6.3
fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10
gilbertwat:bootstrap3-daterangepicker@1.3.21_1
hot-code-push@1.0.4
@ -59,12 +60,12 @@ meteor-base@1.0.4
meteor-platform@1.2.6
minifier-css@1.2.15
minifier-js@1.2.15
minimongo@1.0.18
minimongo@1.0.19
mobile-experience@1.0.4
mobile-status-bar@1.0.13
modules@0.7.7
modules-runtime@0.7.7
momentjs:moment@2.15.2
momentjs:moment@2.16.0
mongo@1.1.14
mongo-id@1.0.6
mrt:moment@2.8.1
@ -72,12 +73,19 @@ natestrauser:select2@4.0.3
npm-mongo@2.2.11_2
observe-sequence@1.0.14
ohif:core@0.0.1
ohif:cornerstone@0.0.1
ohif:dicom-services@0.0.1
ohif:hanging-protocols@0.0.1
ohif:log@0.0.1
ohif:study-list@0.0.1
ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1
ordered-dict@1.0.9
orthanc-remote@0.0.1
peppelg:bootstrap-3-modal@1.0.4
practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2
promise@0.8.8
raix:eventemitter@0.1.3
random@1.0.10
rate-limit@1.0.6
reactive-dict@1.1.8
@ -85,7 +93,6 @@ reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
routepolicy@1.0.12
rwatts:uuid@0.1.0
service-configuration@1.0.11
session@1.1.7
shell-server@0.2.1
@ -95,7 +102,7 @@ spacebars-compiler@1.0.13
standard-app-packages@1.0.9
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
stylus@2.513.6
stylus@2.513.8
templating@1.2.15
templating-compiler@1.2.15
templating-runtime@1.2.15
@ -106,8 +113,5 @@ ui@1.0.12
underscore@1.0.10
url@1.0.11
validatejs@0.0.1
viewerbase@0.0.1
wadoproxy@0.0.1
webapp@1.3.12
webapp-hashing@1.0.9
worklist@0.0.1

1
StandaloneViewer/StandaloneViewer/package.json
View File

@ -5,6 +5,7 @@
"start": "meteor run"
},
"dependencies": {
"babel-runtime": "^6.18.0",
"meteor-node-stubs": "~0.2.0"
}
}