TrizTech/ohif-viewer
15
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 2017-06-08 15:16:48 +02:00
parent 6c98c6a589
commit ddef3c4710
59 changed files with 2435 additions and 29162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LesionTracker/.meteor/.finished-upgraders
View File

@ -14,3 +14,5 @@ notices-for-facebook-graph-api-2
1.3.5-remove-old-dev-bundle-link 1.3.5-remove-old-dev-bundle-link
1.4.0-remove-old-dev-bundle-link 1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package 1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package

61
LesionTracker/.meteor/packages
View File

@ -6,16 +6,25 @@
npm-bcrypt@0.9.2 npm-bcrypt@0.9.2
meteor-base@1.0.4 # Packages every Meteor app needs to have meteor-base@1.1.0 # Packages every Meteor app needs to have
mobile-experience@1.0.4 # Packages for a great mobile UX mobile-experience@1.0.4 # Packages for a great mobile UX
mongo@1.1.14 # The database Meteor supports right now mongo@1.1.18 # The database Meteor supports right now
blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views
session@1.1.7 # Client-side reactive dictionary for your app session@1.1.7 # Client-side reactive dictionary for your app
jquery@1.11.10 # Helpful client-side library jquery@1.11.10 # Helpful client-side library
tracker@1.1.1 # Meteor's client-side reactive programming library tracker@1.1.3 # Meteor's client-side reactive programming library
standard-minifier-css
standard-minifier-js
http@1.2.12
promise@0.8.9
stylus@2.513.9
random@1.0.10
reactive-var@1.0.11
reactive-dict@1.1.9
check@1.2.5
email@1.2.1
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers. es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.6.1 # Enable ECMAScript2015+ syntax in app code ecmascript@0.8.0 # Enable ECMAScript2015+ syntax in app code
clinical:active-entry clinical:active-entry
clinical:theming clinical:theming
@ -23,50 +32,44 @@ clinical:fonts
clinical:hipaa-audit-log clinical:hipaa-audit-log
clinical:hipaa-logger clinical:hipaa-logger
aldeed:simple-schema # Third party package to deal with schemas
# OHIF Packages # OHIF Packages
ohif:polyfill ohif:polyfill
ohif:design ohif:design
ohif:core ohif:core
ohif:user
ohif:header ohif:header
ohif:select-tree
ohif:cornerstone ohif:cornerstone
ohif:viewerbase ohif:viewerbase
ohif:study-list ohif:study-list
ohif:dicom-services ohif:dicom-services
ohif:hanging-protocols ohif:hanging-protocols
ohif:user-management
ohif:lesiontracker
ohif:metadata ohif:metadata
accounts-base@1.2.14 # Necessary for Lesion Trakcer
accounts-password@1.3.3 ohif:lesiontracker
ian:accounts-ui-bootstrap-3 ohif:user
twbs:bootstrap ohif:user-management
http@1.2.10 ohif:select-tree
arsnebula:reactive-promise
promise@0.8.8
stylus@2.513.8
fortawesome:fontawesome
random@1.0.10
reactive-var@1.0.11
reactive-dict@1.1.8
practicalmeteor:loglevel
momentjs:moment@2.15.1
anti:gagarin@=0.4.11 accounts-base@1.3.0
check@1.2.4 accounts-password@1.3.6
twbs:bootstrap
fortawesome:fontawesome
momentjs:moment@2.15.1
aldeed:simple-schema # Third party package to deal with schemas
aldeed:template-extension@4.0.0 aldeed:template-extension@4.0.0
aldeed:collection2
zuuk:stale-session zuuk:stale-session
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
email@1.1.18 email@1.1.18
peppelg:bootstrap-3-modal peppelg:bootstrap-3-modal
simple:reactive-method simple:reactive-method
fastclick@1.0.13 fastclick@1.0.13
standard-minifier-css@1.3.2 standard-minifier-css@1.3.2
standard-minifier-js@1.2.1 standard-minifier-js@1.2.1
=======
gilbertwat:bootstrap3-daterangepicker
>>>>>>> Move towards NPM for Cornerstone dependencies
johdirr:meteor-git-rev johdirr:meteor-git-rev
u2622:persistent-session@0.4.4 u2622:persistent-session@0.4.4
shell-server@0.2.1 shell-server@0.2.3
aldeed:collection2

2
LesionTracker/.meteor/release
View File

@ -1 +1 @@
METEOR@1.4.2.3 METEOR@1.5

97
LesionTracker/.meteor/versions
View File

@ -1,5 +1,5 @@
accounts-base@1.2.14 accounts-base@1.3.0
accounts-password@1.3.3 accounts-password@1.3.6
aldeed:collection2@2.10.0 aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0 aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0 aldeed:schema-deny@1.1.0
@ -8,41 +8,44 @@ aldeed:simple-schema@1.5.3
aldeed:template-extension@4.0.0 aldeed:template-extension@4.0.0
allow-deny@1.0.5 allow-deny@1.0.5
amplify@1.0.0 amplify@1.0.0
anti:gagarin@0.4.11
anti:i18n@0.4.3
arsnebula:reactive-promise@0.9.1
autoupdate@1.3.12 autoupdate@1.3.12
babel-compiler@6.13.0 babel-compiler@6.19.1
babel-runtime@1.0.1 babel-runtime@1.0.1
base64@1.0.10 base64@1.0.10
binary-heap@1.0.10 binary-heap@1.0.10
blaze@2.2.0 blaze@2.3.2
blaze-html-templates@1.0.5 blaze-html-templates@1.0.5
blaze-tools@1.0.10 blaze-tools@1.0.10
boilerplate-generator@1.0.11 boilerplate-generator@1.1.0
caching-compiler@1.1.9 caching-compiler@1.1.9
caching-html-compiler@1.0.7 caching-html-compiler@1.0.7
callback-hook@1.0.10 callback-hook@1.0.10
check@1.2.4 check@1.2.5
clinical:active-entry@1.5.16 clinical:active-entry@1.5.16
clinical:auto-resizing@0.2.0 clinical:auto-resizing@0.2.0
clinical:fonts@1.1.4 clinical:fonts@1.1.4
clinical:hipaa-audit-log@2.4.2 clinical:hipaa-audit-log@2.4.2
clinical:hipaa-logger@1.0.1 clinical:hipaa-logger@1.0.1
clinical:theming@0.4.10 clinical:theming@0.4.10
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
coffeescript@1.11.1_4 coffeescript@1.11.1_4
dangrossman:bootstrap-daterangepicker@2.1.13 dangrossman:bootstrap-daterangepicker@2.1.13
=======
>>>>>>> Move towards NPM for Cornerstone dependencies
ddp@1.2.5 ddp@1.2.5
ddp-client@1.3.2 ddp-client@1.3.4
ddp-common@1.2.8 ddp-common@1.2.8
ddp-rate-limiter@1.0.6 ddp-rate-limiter@1.0.7
ddp-server@1.3.12 ddp-server@1.3.14
deps@1.0.12 deps@1.0.12
diff-sequence@1.0.7 diff-sequence@1.0.7
ecmascript@0.6.1 dynamic-import@0.1.0
ecmascript-runtime@0.3.15 ecmascript@0.8.0
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.1
ecmascript-runtime-server@0.4.1
ejson@1.0.13 ejson@1.0.13
email@1.1.18 email@1.2.1
es5-shim@4.6.15 es5-shim@4.6.15
fastclick@1.0.13 fastclick@1.0.13
fortawesome:fontawesome@4.7.0 fortawesome:fontawesome@4.7.0
@ -51,8 +54,7 @@ grove:less@0.2.0
hot-code-push@1.0.4 hot-code-push@1.0.4
html-tools@1.0.11 html-tools@1.0.11
htmljs@1.0.11 htmljs@1.0.11
http@1.2.10 http@1.2.12
ian:accounts-ui-bootstrap-3@1.2.89
id-map@1.0.9 id-map@1.0.9
iron:controller@1.0.12 iron:controller@1.0.12
iron:core@1.0.11 iron:core@1.0.11
@ -64,30 +66,35 @@ iron:router@1.0.13
iron:url@1.0.11 iron:url@1.0.11
johdirr:meteor-git-rev@0.0.4 johdirr:meteor-git-rev@0.0.4
jquery@1.11.10 jquery@1.11.10
launch-screen@1.1.0 launch-screen@1.1.1
livedata@1.0.18 livedata@1.0.18
localstorage@1.0.12 localstorage@1.1.0
logging@1.1.16 logging@1.1.17
mdg:validation-error@0.5.1 mdg:validation-error@0.5.1
meteor@1.6.0 meteor@1.6.1
meteor-base@1.0.4 meteor-base@1.1.0
meteor-platform@1.2.6 meteor-platform@1.2.6
minifier-css@1.2.15 minifier-css@1.2.16
minifier-js@1.2.15 minifier-js@2.1.0
minimongo@1.0.19 minimongo@1.2.0
mobile-experience@1.0.4 mobile-experience@1.0.4
mobile-status-bar@1.0.13 mobile-status-bar@1.0.14
modules@0.7.7 modules@0.9.0
modules-runtime@0.7.7 modules-runtime@0.8.0
momentjs:moment@2.16.0 momentjs:moment@2.16.0
mongo@1.1.14 mongo@1.1.18
mongo-id@1.0.6 mongo-id@1.0.6
mrt:moment@2.8.1 mrt:moment@2.8.1
natestrauser:select2@4.0.3 natestrauser:select2@4.0.3
npm-bcrypt@0.9.2 npm-bcrypt@0.9.2
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
npm-mongo@2.2.11_2 npm-mongo@2.2.11_2
observe-sequence@1.0.14 observe-sequence@1.0.14
ohif:commands@0.0.1 ohif:commands@0.0.1
=======
npm-mongo@2.2.24
observe-sequence@1.0.16
>>>>>>> Move towards NPM for Cornerstone dependencies
ohif:core@0.0.1 ohif:core@0.0.1
ohif:cornerstone@0.0.1 ohif:cornerstone@0.0.1
ohif:design@0.0.1 ohif:design@0.0.1
@ -109,14 +116,11 @@ ohif:user-management@0.0.1
ohif:viewerbase@0.0.1 ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1 ohif:wadoproxy@0.0.1
ordered-dict@1.0.9 ordered-dict@1.0.9
peppelg:bootstrap-3-modal@1.0.4 promise@0.8.9
practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2
promise@0.8.8
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
random@1.0.10 random@1.0.10
rate-limit@1.0.6 rate-limit@1.0.8
reactive-dict@1.1.8 reactive-dict@1.1.9
reactive-var@1.0.11 reactive-var@1.0.11
reload@1.1.11 reload@1.1.11
retry@1.0.9 retry@1.0.9
@ -124,29 +128,28 @@ routepolicy@1.0.12
service-configuration@1.0.11 service-configuration@1.0.11
session@1.1.7 session@1.1.7
sha@1.0.9 sha@1.0.9
shell-server@0.2.1 shell-server@0.2.3
silentcicero:jszip@0.0.4 silentcicero:jszip@0.0.4
simple:reactive-method@1.0.2 spacebars@1.0.15
spacebars@1.0.13 spacebars-compiler@1.1.2
spacebars-compiler@1.0.13
srp@1.0.10 srp@1.0.10
standard-app-packages@1.0.9 standard-app-packages@1.0.9
standard-minifier-css@1.3.2 standard-minifier-css@1.3.4
standard-minifier-js@1.2.1 standard-minifier-js@2.1.0
stylus@2.513.8 stylus@2.513.9
templating@1.2.15 templating@1.2.15
templating-compiler@1.2.15 templating-compiler@1.2.15
templating-runtime@1.2.15 templating-runtime@1.2.15
templating-tools@1.0.5 templating-tools@1.1.1
tracker@1.1.1 tracker@1.1.3
twbs:bootstrap@3.3.6 twbs:bootstrap@3.3.6
typ:accounts-ldap@1.0.1 typ:accounts-ldap@1.0.1
typ:ldapjs@0.7.3 typ:ldapjs@0.7.3
u2622:persistent-session@0.4.4 u2622:persistent-session@0.4.4
ui@1.0.12 ui@1.0.13
underscore@1.0.10 underscore@1.0.10
url@1.0.11 url@1.1.0
validatejs@0.0.1 validatejs@0.0.1
webapp@1.3.12 webapp@1.3.16
webapp-hashing@1.0.9 webapp-hashing@1.0.9
zuuk:stale-session@1.0.8 zuuk:stale-session@1.0.8

6
LesionTracker/client/log.js
View File

@ -1,3 +1,3 @@
// Create application logger using loglevel import loglevel from 'loglevel';
// https://atmospherejs.com/spacejamio/loglevel log = loglevel.getLogger('OHIFViewer');
log = loglevel.createAppLogger('LesionTracker', defaultLevel = 'info'); log.setLevel('info');

22
LesionTracker/client/routes.js
View File

@ -30,15 +30,21 @@ Router.route('/', function() {
Router.go('studylist', {}, { replaceState: true }); Router.go('studylist', {}, { replaceState: true });
}, { name: 'home' }); }, { name: 'home' });
Router.route('/studylist', function() { Router.route('/studylist', {
// Retrieve the timepoints data to display in studylist name: 'studylist',
const promise = OHIF.studylist.timepointApi.retrieveTimepoints({}).then(() => { onBeforeAction: function() {
this.render('app', { data: { template: 'studylist' } }); const next = this.next;
});
// Show loading state while preparing the studylist data // Retrieve the timepoints data to display in studylist
OHIF.ui.showDialog('dialogLoading', { promise }); const promise = OHIF.studylist.timepointApi.retrieveTimepoints({});
}, { name: 'studylist' }); promise.then(() => {
next()
});
},
render: function() {
this.render('app', { data: { template: 'studylist' } });
}
});
Router.route('/viewer/timepoints/:timepointId', function() { Router.route('/viewer/timepoints/:timepointId', function() {
const timepointId = this.params.timepointId; const timepointId = this.params.timepointId;

1
LesionTracker/package.json
View File

@ -11,6 +11,7 @@
"dependencies": { "dependencies": {
"babel-runtime": "^6.20.0", "babel-runtime": "^6.20.0",
"bcrypt": "^0.8.7", "bcrypt": "^0.8.7",
"loglevel": "^1.4.1",
"meteor-node-stubs": "^0.2.3" "meteor-node-stubs": "^0.2.3"
}, },
"devDependencies": { "devDependencies": {

16
LesionTracker/server/dropAllCollections.js
View File

@ -1,16 +0,0 @@
// Temporary fix to drop all Collections on server restart
// http://stackoverflow.com/questions/23891631/meteor-how-can-i-drop-all-mongo-collections-and-clear-all-data-on-startup
Meteor.startup(() => {
if (Meteor.settings.dropCollections === true) {
console.warn('Dropping all global Collections!');
Object.keys(global).forEach((key) => {
const object = global[key];
if (object instanceof Meteor.Collection) {
if (!(/^server|currentServer$/).test(object._name)) {
console.warn(`Dropping: ${object._debugName || object._name}`);
object.remove({});
}
}
});
}
});

2
OHIFViewer/.meteor/.finished-upgraders
View File

@ -14,3 +14,5 @@ notices-for-facebook-graph-api-2
1.3.5-remove-old-dev-bundle-link 1.3.5-remove-old-dev-bundle-link
1.4.0-remove-old-dev-bundle-link 1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package 1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package

57
OHIFViewer/.meteor/packages
View File

@ -4,6 +4,30 @@
# 'meteor add' and 'meteor remove' will edit this file for you, # 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand. # but you can also edit it by hand.
http@1.2.12
promise@0.8.9
stylus@2.513.9
meteor-base@1.1.0
mobile-experience@1.0.4
mongo@1.1.18
blaze-html-templates@1.0.4
session@1.1.7
jquery@1.11.10
tracker@1.1.3
logging@1.1.17
reload@1.1.11
random@1.0.10
ejson@1.0.13
spacebars@1.0.12
check@1.2.5
ecmascript@0.8.0
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
reactive-var@1.0.11
reactive-dict@1.1.9
standard-minifier-css@1.3.4
standard-minifier-js@2.1.0
# OHIF Packages # OHIF Packages
ohif:polyfill ohif:polyfill
ohif:design ohif:design
@ -16,39 +40,14 @@ ohif:viewerbase
ohif:study-list ohif:study-list
ohif:dicom-services ohif:dicom-services
ohif:hanging-protocols ohif:hanging-protocols
# ohif:user-management
ohif:metadata ohif:metadata
twbs:bootstrap twbs:bootstrap
http@1.2.10
arsnebula:reactive-promise
promise@0.8.8
stylus@2.513.8
fortawesome:fontawesome fortawesome:fontawesome
meteor-base@1.0.4 momentjs:moment@2.15.1
mobile-experience@1.0.4
mongo@1.1.14
blaze-html-templates@1.0.4
session@1.1.7
jquery@1.11.10
tracker@1.1.1
logging@1.1.16
reload@1.1.11
random@1.0.10
ejson@1.0.13
spacebars@1.0.12
check@1.2.4
aldeed:simple-schema # Third party package to deal with schemas aldeed:simple-schema # Third party package to deal with schemas
ecmascript@0.6.1 aldeed:template-extension
reactive-var@1.0.11 gilbertwat:bootstrap3-daterangepicker
practicalmeteor:loglevel
reactive-dict@1.1.8
fastclick@1.0.13
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
johdirr:meteor-git-rev johdirr:meteor-git-rev
u2622:persistent-session@0.4.4 u2622:persistent-session@0.4.4
aldeed:template-extension shell-server@0.2.3
peppelg:bootstrap-3-modal
shell-server@0.2.1

2
OHIFViewer/.meteor/release
View File

@ -1 +1 @@
METEOR@1.4.2.3 METEOR@1.5

101
OHIFViewer/.meteor/versions
View File

@ -1,45 +1,52 @@
accounts-base@1.2.14 accounts-base@1.3.0
aldeed:collection2@2.10.0 aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0 aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0 aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1 aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3 aldeed:simple-schema@1.5.3
aldeed:template-extension@4.0.0 aldeed:template-extension@4.1.0
allow-deny@1.0.5 allow-deny@1.0.5
amplify@1.0.0 amplify@1.0.0
arsnebula:reactive-promise@0.9.1
autoupdate@1.3.12 autoupdate@1.3.12
babel-compiler@6.13.0 babel-compiler@6.19.2
babel-runtime@1.0.1 babel-runtime@1.0.1
base64@1.0.10 base64@1.0.10
binary-heap@1.0.10 binary-heap@1.0.10
blaze@2.2.0 blaze@2.3.2
blaze-html-templates@1.0.5 blaze-html-templates@1.1.2
blaze-tools@1.0.10 blaze-tools@1.0.10
boilerplate-generator@1.0.11 boilerplate-generator@1.1.0
caching-compiler@1.1.9 caching-compiler@1.1.9
caching-html-compiler@1.0.7 caching-html-compiler@1.1.2
callback-hook@1.0.10 callback-hook@1.0.10
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
check@1.2.4 check@1.2.4
coffeescript@1.11.1_4 coffeescript@1.11.1_4
dangrossman:bootstrap-daterangepicker@2.1.13 dangrossman:bootstrap-daterangepicker@2.1.13
=======
check@1.2.5
>>>>>>> Move towards NPM for Cornerstone dependencies
ddp@1.2.5 ddp@1.2.5
ddp-client@1.3.2 ddp-client@1.3.4
ddp-common@1.2.8 ddp-common@1.2.8
ddp-rate-limiter@1.0.6 ddp-rate-limiter@1.0.7
ddp-server@1.3.12 ddp-server@1.3.14
deps@1.0.12 deps@1.0.12
diff-sequence@1.0.7 diff-sequence@1.0.7
ecmascript@0.6.1 dynamic-import@0.1.1
ecmascript-runtime@0.3.15 ecmascript@0.8.0
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.2
ecmascript-runtime-server@0.4.1
ejson@1.0.13 ejson@1.0.13
es5-shim@4.6.15
fastclick@1.0.13 fastclick@1.0.13
fortawesome:fontawesome@4.7.0 fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10 geojson-utils@1.0.10
hot-code-push@1.0.4 hot-code-push@1.0.4
html-tools@1.0.11 html-tools@1.0.11
htmljs@1.0.11 htmljs@1.0.11
http@1.2.10 http@1.2.12
id-map@1.0.9 id-map@1.0.9
iron:controller@1.0.12 iron:controller@1.0.12
iron:core@1.0.11 iron:core@1.0.11
@ -51,28 +58,33 @@ iron:router@1.0.13
iron:url@1.0.11 iron:url@1.0.11
johdirr:meteor-git-rev@0.0.4 johdirr:meteor-git-rev@0.0.4
jquery@1.11.10 jquery@1.11.10
launch-screen@1.1.0 launch-screen@1.1.1
livedata@1.0.18 livedata@1.0.18
localstorage@1.0.12 localstorage@1.1.0
logging@1.1.16 logging@1.1.17
mdg:validation-error@0.5.1 mdg:validation-error@0.5.1
meteor@1.6.0 meteor@1.6.1
meteor-base@1.0.4 meteor-base@1.1.0
meteor-platform@1.2.6 meteor-platform@1.2.6
minifier-css@1.2.15 minifier-css@1.2.16
minifier-js@1.2.15 minifier-js@2.1.0
minimongo@1.0.19 minimongo@1.2.1
mobile-experience@1.0.4 mobile-experience@1.0.4
mobile-status-bar@1.0.13 mobile-status-bar@1.0.14
modules@0.7.7 modules@0.9.1
modules-runtime@0.7.7 modules-runtime@0.8.0
momentjs:moment@2.16.0 momentjs:moment@2.16.0
mongo@1.1.14 mongo@1.1.18
mongo-id@1.0.6 mongo-id@1.0.6
natestrauser:select2@4.0.3 natestrauser:select2@4.0.3
<<<<<<< 3d081fe297551d37cd9691a7c60be1f743b9e600
npm-mongo@2.2.11_2 npm-mongo@2.2.11_2
observe-sequence@1.0.14 observe-sequence@1.0.14
ohif:commands@0.0.1 ohif:commands@0.0.1
=======
npm-mongo@2.2.24
observe-sequence@1.0.16
>>>>>>> Move towards NPM for Cornerstone dependencies
ohif:core@0.0.1 ohif:core@0.0.1
ohif:cornerstone@0.0.1 ohif:cornerstone@0.0.1
ohif:design@0.0.1 ohif:design@0.0.1
@ -89,38 +101,35 @@ ohif:themes-common@0.0.1
ohif:viewerbase@0.0.1 ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1 ohif:wadoproxy@0.0.1
ordered-dict@1.0.9 ordered-dict@1.0.9
peppelg:bootstrap-3-modal@1.0.4 promise@0.8.9
practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2
promise@0.8.8
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
random@1.0.10 random@1.0.10
rate-limit@1.0.6 rate-limit@1.0.8
reactive-dict@1.1.8 reactive-dict@1.1.9
reactive-var@1.0.11 reactive-var@1.0.11
reload@1.1.11 reload@1.1.11
retry@1.0.9 retry@1.0.9
routepolicy@1.0.12 routepolicy@1.0.12
service-configuration@1.0.11 service-configuration@1.0.11
session@1.1.7 session@1.1.7
shell-server@0.2.1 shell-server@0.2.3
silentcicero:jszip@0.0.4 silentcicero:jszip@0.0.4
spacebars@1.0.13 spacebars@1.0.15
spacebars-compiler@1.0.13 spacebars-compiler@1.1.2
standard-app-packages@1.0.9 standard-app-packages@1.0.9
standard-minifier-css@1.3.2 standard-minifier-css@1.3.4
standard-minifier-js@1.2.1 standard-minifier-js@2.1.0
stylus@2.513.8 stylus@2.513.9
templating@1.2.15 templating@1.3.2
templating-compiler@1.2.15 templating-compiler@1.3.2
templating-runtime@1.2.15 templating-runtime@1.3.2
templating-tools@1.0.5 templating-tools@1.1.2
tracker@1.1.1 tracker@1.1.3
twbs:bootstrap@3.3.6 twbs:bootstrap@3.3.6
u2622:persistent-session@0.4.4 u2622:persistent-session@0.4.4
ui@1.0.12 ui@1.0.13
underscore@1.0.10 underscore@1.0.10
url@1.0.11 url@1.1.0
validatejs@0.0.1 validatejs@0.0.1
webapp@1.3.12 webapp@1.3.16
webapp-hashing@1.0.9 webapp-hashing@1.0.9

6
OHIFViewer/client/log.js
View File

@ -1,3 +1,3 @@
// Create application logger using loglevel import loglevel from 'loglevel';
// https://atmospherejs.com/spacejamio/loglevel log = loglevel.getLogger('OHIFViewer');
log = loglevel.createAppLogger('OHIFViewer', defaultLevel = 'info'); log.setLevel('info');

3
OHIFViewer/package.json
View File

@ -4,7 +4,8 @@
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"babel-runtime": "^6.22.0" "babel-runtime": "^6.22.0",
"loglevel": "^1.4.1"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

2
Packages/ohif-core/client/components/bootstrap/dialog/loading.js
View File

@ -9,6 +9,6 @@ Template.dialogLoading.onRendered(() => {
$modal.modal({ $modal.modal({
backdrop: 'static', backdrop: 'static',
keyboard: false, keyboard: false,
modal: true show: true
}); });
}); });

2
Packages/ohif-core/client/components/bootstrap/dialog/simple.js
View File

@ -8,7 +8,7 @@ Template.dialogSimple.onCreated(() => {
instance.close = () => { instance.close = () => {
const $modal = instance.$('.modal'); const $modal = instance.$('.modal');
$modal.on('hidden.bs.modal', () => instance.data.promiseResolve()).modal('hide'); $modal.one('hidden.bs.modal', () => instance.data.promiseResolve()).modal('hide');
}; };
// Automatically close the modal if a timeout value was given // Automatically close the modal if a timeout value was given

4
Packages/ohif-core/client/components/bootstrap/dialog/unsavedChangesDialog.js
View File

@ -12,7 +12,7 @@ Template.unsavedChangesDialog.onRendered(function() {
const instance = Template.instance(); const instance = Template.instance();
const $modal = instance.$('.modal.unsavedChangesDialog'); const $modal = instance.$('.modal.unsavedChangesDialog');
// Routine which effectivelly displays the BS modal... // Routine which effectively displays the BS modal...
instance.displayModal = () => { instance.displayModal = () => {
// Make modal options extensible... // Make modal options extensible...
@ -22,7 +22,7 @@ Template.unsavedChangesDialog.onRendered(function() {
}, instance.data.modalOptions); }, instance.data.modalOptions);
// Set handler for "hidden" event... Simply remove the view! // Set handler for "hidden" event... Simply remove the view!
$modal.on('hidden.bs.modal', () => { $modal.one('hidden.bs.modal', () => {
Blaze.remove(instance.view); Blaze.remove(instance.view);
}); });

4585
Packages/ohif-cornerstone/client/cornerstone.js
View File

File diff suppressed because it is too large Load Diff

1995
Packages/ohif-cornerstone/client/cornerstoneMath.js
View File

File diff suppressed because it is too large Load Diff

12233
Packages/ohif-cornerstone/client/cornerstoneTools.js
View File

File diff suppressed because it is too large Load Diff

2196
Packages/ohif-cornerstone/client/cornerstoneWADOImageLoader.js
View File

File diff suppressed because it is too large Load Diff

2682
Packages/ohif-cornerstone/client/dicomParser.js
View File

File diff suppressed because it is too large Load Diff

3240
Packages/ohif-cornerstone/client/hammer.js
View File

File diff suppressed because it is too large Load Diff

4
Packages/ohif-cornerstone/client/index.js
View File

@ -1,4 +1,4 @@
import { Cornerstone } from '../namespace'; import { OHIF } from '../namespace';
import { MetadataProvider } from './lib/classes/MetadataProvider'; import { MetadataProvider } from './lib/classes/MetadataProvider';
Cornerstone.metadataProvider = new MetadataProvider(); OHIF.cornerstone.metadataProvider = new MetadataProvider();

33
Packages/ohif-cornerstone/client/jquery.hammer.js
View File

@ -1,33 +0,0 @@
(function(factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery', 'hammerjs'], factory);
} else if (typeof exports === 'object') {
factory(require('jquery'), require('hammerjs'));
} else {
factory(jQuery, Hammer);
}
}(function($, Hammer) {
function hammerify(el, options) {
var $el = $(el);
if(!$el.data("hammer")) {
$el.data("hammer", new Hammer($el[0], options));
}
}
$.fn.hammer = function(options) {
return this.each(function() {
hammerify(this, options);
});
};
// extend the emit method to also trigger jQuery events
Hammer.Manager.prototype.emit = (function(originalEmit) {
return function(type, data) {
originalEmit.call(this, type, data);
$(this.element).trigger({
type: type,
gesture: data
});
};
})(Hammer.Manager.prototype.emit);
}));

14
Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js
View File

@ -1,3 +1,4 @@
import * as cornerstoneMath from 'cornerstone-math';
import { parsingUtils } from '../parsingUtils'; import { parsingUtils } from '../parsingUtils';
const FUNCTION = 'function'; const FUNCTION = 'function';
@ -245,21 +246,16 @@ export class MetadataProvider {
} }
return { return {
frameOfReferenceUID: frameOfReferenceUID: instance.frameOfReferenceUID,
instance.frameOfReferenceUID, rows: instance.rows,
rows: columns: instance.columns,
instance.rows,
columns:
instance.columns,
rowCosines: rowCosines:
new cornerstoneMath.Vector3(parseFloat(imageOrientation[0]), parseFloat(imageOrientation[1]), parseFloat(imageOrientation[2])), new cornerstoneMath.Vector3(parseFloat(imageOrientation[0]), parseFloat(imageOrientation[1]), parseFloat(imageOrientation[2])),
columnCosines: columnCosines:
new cornerstoneMath.Vector3(parseFloat(imageOrientation[3]), parseFloat(imageOrientation[4]), parseFloat(imageOrientation[5])), new cornerstoneMath.Vector3(parseFloat(imageOrientation[3]), parseFloat(imageOrientation[4]), parseFloat(imageOrientation[5])),
imagePositionPatient: imagePositionPatient:
new cornerstoneMath.Vector3(parseFloat(imagePosition[0]), parseFloat(imagePosition[1]), parseFloat(imagePosition[2])), new cornerstoneMath.Vector3(parseFloat(imagePosition[0]), parseFloat(imagePosition[1]), parseFloat(imagePosition[2])),
rowPixelSpacing:
rowPixelSpacing, rowPixelSpacing,
columnPixelSpacing:
columnPixelSpacing, columnPixelSpacing,
}; };
} }
@ -318,7 +314,7 @@ export class MetadataProvider {
} }
/** /**
* Get a bound reference to the privider function. * Get a bound reference to the provider function.
*/ */
getProvider() { getProvider() {
let provider = this._provider; let provider = this._provider;

4
Packages/ohif-cornerstone/client/lib/parsingUtils.js
View File

@ -1,6 +1,4 @@
/** import * as dicomParser from 'dicom-parser';
* Globals: dicomParser
*/
/** /**
* A small set of utilities to help parsing DICOM element values. * A small set of utilities to help parsing DICOM element values.

20
Packages/ohif-cornerstone/main.js
View File

@ -2,7 +2,7 @@
* Import namespace... * Import namespace...
*/ */
import { OHIF, Cornerstone } from './namespace.js'; import { OHIF } from './namespace.js';
/** /**
* Import scripts that will populate the Cornerstone namespace as a side effect only import. This is effectively the public API... * Import scripts that will populate the Cornerstone namespace as a side effect only import. This is effectively the public API...
@ -10,4 +10,20 @@ import { OHIF, Cornerstone } from './namespace.js';
import './client/'; // which is actually: import './client/index.js'; import './client/'; // which is actually: import './client/index.js';
export { OHIF, Cornerstone }; import * as cornerstone from 'cornerstone-core';
import * as cornerstoneTools from 'cornerstone-tools';
import * as cornerstoneMath from 'cornerstone-math';
import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
import * as dicomParser from 'dicom-parser';
debugger;
export {
cornerstone,
cornerstoneTools,
cornerstoneMath,
cornerstoneWADOImageLoader,
dicomParser
};
export { OHIF };

2
Packages/ohif-cornerstone/namespace.js
View File

@ -22,4 +22,4 @@ OHIF.cornerstone = Cornerstone;
* Export relevant objects * Export relevant objects
*/ */
export { OHIF, Cornerstone }; export { OHIF };

40
Packages/ohif-cornerstone/package.js
View File

@ -4,45 +4,31 @@ Package.describe({
version: '0.0.1' version: '0.0.1'
}); });
Npm.depends({
'hammerjs': '2.0.8',
'jquery-hammerjs': '2.0.0',
'cornerstone-core': '0.11.0',
'cornerstone-tools': '0.8.9',
'cornerstone-math': '0.1.6',
'dicom-parser': '1.7.5',
'cornerstone-wado-image-loader': '0.14.6'
});
Package.onUse(function(api) { Package.onUse(function(api) {
api.versionsFrom('1.4'); api.versionsFrom('1.5');
api.use('ecmascript'); api.use('ecmascript');
api.use('jquery'); api.use('jquery');
api.use('ohif:core'); api.use('ohif:core');
api.addFiles('client/cornerstone.js', 'client', {
bare: true
});
api.addFiles('client/cornerstoneMath.js', 'client', {
bare: true
});
api.addFiles('client/cornerstoneTools.js', 'client', {
bare: true
});
api.addFiles('client/cornerstoneWADOImageLoader.js', 'client', {
bare: true
});
api.addFiles('client/dicomParser.js', 'client', {
bare: true
});
api.addFiles('client/hammer.js', 'client', {
bare: true
});
api.addFiles('client/jquery.hammer.js', 'client', {
bare: true
});
api.addAssets('public/js/cornerstoneWADOImageLoaderCodecs.es5.js', 'client'); api.addAssets('public/js/cornerstoneWADOImageLoaderCodecs.es5.js', 'client');
api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.es5.js', 'client'); api.addAssets('public/js/cornerstoneWADOImageLoaderWebWorker.es5.js', 'client');
api.mainModule('main.js', 'client');
api.export('cornerstone', 'client'); api.export('cornerstone', 'client');
api.export('cornerstoneMath', 'client'); api.export('cornerstoneMath', 'client');
api.export('cornerstoneTools', 'client'); api.export('cornerstoneTools', 'client');
api.export('cornerstoneWADOImageLoader', 'client'); api.export('cornerstoneWADOImageLoader', 'client');
api.export('dicomParser', 'client'); api.export('dicomParser', 'client');
api.mainModule('main.js', 'client');
}); });

2
Packages/ohif-lesiontracker/both/configuration/configuration.js
View File

@ -5,8 +5,6 @@ import { retrieveMeasurements, storeMeasurements, retrieveTimepoints, storeTimep
import { validateMeasurements } from './dataValidation'; import { validateMeasurements } from './dataValidation';
import { FieldLesionLocation, FieldLesionLocationResponse } from 'meteor/ohif:lesiontracker/both/schema/fields'; import { FieldLesionLocation, FieldLesionLocationResponse } from 'meteor/ohif:lesiontracker/both/schema/fields';
console.log('OHIF-LesionTracker: Defining Configuration for Measurements');
const newMeasurementTool = { const newMeasurementTool = {
id: 'newLesions', id: 'newLesions',
name: 'New Lesions' name: 'New Lesions'

36
Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool.js
View File

@ -1,9 +1,7 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase'; import { Viewerbase } from 'meteor/ohif:viewerbase';
(function($, cornerstone, cornerstoneMath, cornerstoneTools) { import { cornerstone, cornerstoneMath, cornerstoneTools } from 'meteor/ohif:cornerstone';
'use strict';
var toolType = 'bidirectional'; var toolType = 'bidirectional';
@ -376,6 +374,10 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
} }
var length = cornerstoneMath.point.distance(data.handles.start, data.handles.end); var length = cornerstoneMath.point.distance(data.handles.start, data.handles.end);
if (length === 0) {
return false;
}
var dx = (data.handles.start.x - data.handles.end.x) / length; var dx = (data.handles.start.x - data.handles.end.x) / length;
var dy = (data.handles.start.y - data.handles.end.y) / length; var dy = (data.handles.start.y - data.handles.end.y) / length;
@ -422,18 +424,12 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
data.handles.perpendicularStart.y = adjustedLineP2.y - distanceFromMoved * dx; data.handles.perpendicularStart.y = adjustedLineP2.y - distanceFromMoved * dx;
data.handles.perpendicularEnd.x = data.handles.perpendicularStart.x - total * dy; data.handles.perpendicularEnd.x = data.handles.perpendicularStart.x - total * dy;
data.handles.perpendicularEnd.y = data.handles.perpendicularStart.y + total * dx; data.handles.perpendicularEnd.y = data.handles.perpendicularStart.y + total * dx;
return true;
} else { } else {
data.handles.perpendicularStart.x = adjustedLineP1.x + distanceFromMoved * dy; data.handles.perpendicularStart.x = adjustedLineP1.x + distanceFromMoved * dy;
data.handles.perpendicularStart.y = adjustedLineP1.y - distanceFromMoved * dx; data.handles.perpendicularStart.y = adjustedLineP1.y - distanceFromMoved * dx;
data.handles.perpendicularEnd.x = data.handles.perpendicularStart.x - total * dy; data.handles.perpendicularEnd.x = data.handles.perpendicularStart.x - total * dy;
data.handles.perpendicularEnd.y = data.handles.perpendicularStart.y + total * dx; data.handles.perpendicularEnd.y = data.handles.perpendicularStart.y + total * dx;
return true;
} }
} }
return true; return true;
@ -837,7 +833,18 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
// draw perpendicular line // draw perpendicular line
function drawPerpendicularLine(context, eventData, element, data, color, lineWidth) { function drawPerpendicularLine(context, eventData, element, data, color, lineWidth) {
var startX;
var startY;
var endX;
var endY;
if (data.handles.start.x === data.handles.end.x &&
data.handles.start.y === data.handles.end.y) {
startX = data.handles.start.x;
startY = data.handles.start.y;
endX = data.handles.end.x;
endY = data.handles.end.y;
} else {
// mid point of long-axis line // mid point of long-axis line
var mid = { var mid = {
x: (data.handles.start.x + data.handles.end.x) / 2, x: (data.handles.start.x + data.handles.end.x) / 2,
@ -854,10 +861,11 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
var perpendicularLineLength = length / 2; var perpendicularLineLength = length / 2;
var startX = mid.x + (perpendicularLineLength / 2) * vectorY; startX = mid.x + (perpendicularLineLength / 2) * vectorY;
var startY = mid.y - (perpendicularLineLength / 2) * vectorX; startY = mid.y - (perpendicularLineLength / 2) * vectorX;
var endX = mid.x - (perpendicularLineLength / 2) * vectorY; endX = mid.x - (perpendicularLineLength / 2) * vectorY;
var endY = mid.y + (perpendicularLineLength / 2) * vectorX; endY = mid.y + (perpendicularLineLength / 2) * vectorX;
}
if (data.handles.perpendicularStart.locked) { if (data.handles.perpendicularStart.locked) {
data.handles.perpendicularStart.x = startX; data.handles.perpendicularStart.x = startX;
@ -1146,5 +1154,3 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
}); });
cornerstoneTools.bidirectional.setConfiguration(configuration); cornerstoneTools.bidirectional.setConfiguration(configuration);
})($, cornerstone, cornerstoneMath, cornerstoneTools);

29
Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
View File

@ -1,9 +1,7 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Viewerbase } from 'meteor/ohif:viewerbase'; import { Viewerbase } from 'meteor/ohif:viewerbase';
(function($, cornerstone, cornerstoneMath, cornerstoneTools) { import { cornerstone, cornerstoneMath, cornerstoneTools } from 'meteor/ohif:cornerstone';
'use strict';
const toolType = 'nonTarget'; const toolType = 'nonTarget';
@ -12,14 +10,13 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
const textBoxConfig = toolDefaultStates.textBoxConfig; const textBoxConfig = toolDefaultStates.textBoxConfig;
const configuration = { const configuration = {
getMeasurementLocationCallback: getMeasurementLocationCallback, getMeasurementLocationCallback,
changeMeasurementLocationCallback: changeMeasurementLocationCallback, changeMeasurementLocationCallback,
drawHandles: false, drawHandles: false,
drawHandlesOnHover: true, drawHandlesOnHover: true,
arrowFirst: true, arrowFirst: true,
textBox: textBoxConfig, textBox: textBoxConfig,
...shadowConfig, ...shadowConfig,
}; };
// Used to cancel tool placement // Used to cancel tool placement
@ -395,11 +392,11 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
} }
cornerstoneTools.nonTarget = cornerstoneTools.mouseButtonTool({ cornerstoneTools.nonTarget = cornerstoneTools.mouseButtonTool({
addNewMeasurement: addNewMeasurement, addNewMeasurement,
createNewMeasurement: createNewMeasurement, createNewMeasurement,
onImageRendered: onImageRendered, onImageRendered,
pointNearTool: pointNearTool, pointNearTool,
toolType: toolType, toolType,
mouseDoubleClickCallback: doubleClickCallback mouseDoubleClickCallback: doubleClickCallback
}); });
@ -407,11 +404,9 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
cornerstoneTools.nonTargetTouch = cornerstoneTools.touchTool({ cornerstoneTools.nonTargetTouch = cornerstoneTools.touchTool({
addNewMeasurement: addNewMeasurementTouch, addNewMeasurement: addNewMeasurementTouch,
createNewMeasurement: createNewMeasurement, createNewMeasurement,
onImageRendered: onImageRendered, onImageRendered,
pointNearTool: pointNearTool, pointNearTool,
toolType: toolType toolType
// pressCallback: doubleClickCallback // pressCallback: doubleClickCallback
}); });
})($, cornerstone, cornerstoneMath, cornerstoneTools);

10
Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
View File

@ -1,8 +1,6 @@
import { Viewerbase } from 'meteor/ohif:viewerbase'; import { Viewerbase } from 'meteor/ohif:viewerbase';
import { cornerstone, cornerstoneMath, cornerstoneTools } from 'meteor/ohif:cornerstone';
(function($, cornerstone, cornerstoneMath, cornerstoneTools) {
'use strict';
var responseByToolType = [{ var responseByToolType = [{
"toolType": "targetCR", "toolType": "targetCR",
"toolResponse": "CR" "toolResponse": "CR"
@ -18,8 +16,8 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
const textBoxConfig = toolDefaultStates.textBoxConfig; const textBoxConfig = toolDefaultStates.textBoxConfig;
var configuration = { var configuration = {
getMeasurementLocationCallback: getMeasurementLocationCallback, getMeasurementLocationCallback,
changeMeasurementLocationCallback: changeMeasurementLocationCallback, changeMeasurementLocationCallback,
drawHandles: false, drawHandles: false,
drawHandlesOnHover: false, drawHandlesOnHover: false,
arrowFirst: true, arrowFirst: true,
@ -420,5 +418,3 @@ import { Viewerbase } from 'meteor/ohif:viewerbase';
cornerstoneTools.targetEX = targetEXInterface.mouse; cornerstoneTools.targetEX = targetEXInterface.mouse;
cornerstoneTools.targetEX.setConfiguration(configuration); cornerstoneTools.targetEX.setConfiguration(configuration);
cornerstoneTools.targetEXTouch = targetEXInterface.touch; cornerstoneTools.targetEXTouch = targetEXInterface.touch;
})($, cornerstone, cornerstoneMath, cornerstoneTools);

1
Packages/ohif-lesiontracker/client/lib/studylist/studylistModification.js
View File

@ -7,7 +7,6 @@ Meteor.startup(function() {
OHIF.studylist.callbacks.middleClickOnStudy = dblClickOnStudy; OHIF.studylist.callbacks.middleClickOnStudy = dblClickOnStudy;
OHIF.studylist.timepointApi = new OHIF.measurements.TimepointApi(); OHIF.studylist.timepointApi = new OHIF.measurements.TimepointApi();
OHIF.studylist.timepointApi.retrieveTimepoints({});
}); });
/** /**

9
Packages/ohif-lesiontracker/server/methods.js
View File

@ -13,8 +13,13 @@ const Timepoints = new Mongo.Collection('timepoints');
Timepoints._debugName = 'Timepoints'; Timepoints._debugName = 'Timepoints';
Timepoints.find().observe({ Timepoints.find().observe({
remove() { added(document) {
console.warn('REMOVED'); console.warn('TIMEPOINT ADDED')
console.warn(document);
},
remove(docId) {
console.warn('TIMEPOINT REMOVED');
console.warn(docId);
} }
}); });

7
Packages/ohif-log/main.js
View File

@ -1,7 +1,8 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { loglevel } from 'meteor/practicalmeteor:loglevel'; import loglevel from 'loglevel';
const defaultLevel = Meteor.isProduction ? 'error' : 'trace'; const defaultLevel = Meteor.isProduction ? 'ERROR' : 'TRACE';
// Create package logger using loglevel // Create package logger using loglevel
OHIF.log = loglevel.createLogger('', defaultLevel); OHIF.log = loglevel.getLogger('OHIF');
OHIF.log.setLevel(defaultLevel);

7
Packages/ohif-log/package.js
View File

@ -4,15 +4,16 @@ Package.describe({
version: '0.0.1' version: '0.0.1'
}); });
Npm.depends({
loglevel: '1.4.1'
});
Package.onUse(function(api) { Package.onUse(function(api) {
api.versionsFrom('1.4'); api.versionsFrom('1.4');
api.use('ecmascript'); api.use('ecmascript');
api.use('standard-app-packages'); api.use('standard-app-packages');
// Control over logging
api.use('practicalmeteor:loglevel');
// Our custom packages // Our custom packages
api.use('ohif:core'); api.use('ohif:core');

17
Packages/ohif-measurements/both/configuration/timepoints.js
View File

@ -5,7 +5,7 @@ import { OHIF } from 'meteor/ohif:core';
import { schema as TimepointSchema } from 'meteor/ohif:measurements/both/schema/timepoints'; import { schema as TimepointSchema } from 'meteor/ohif:measurements/both/schema/timepoints';
let configuration = {}; const configuration = {};
class TimepointApi { class TimepointApi {
static setConfiguration(config) { static setConfiguration(config) {
@ -29,19 +29,30 @@ class TimepointApi {
retrieveTimepoints(filter) { retrieveTimepoints(filter) {
const retrievalFn = configuration.dataExchange.retrieve; const retrievalFn = configuration.dataExchange.retrieve;
if (!_.isFunction(retrievalFn)) { if (!_.isFunction(retrievalFn)) {
OHIF.log.error('Timepoint retrieval function has not been configured.')
return; return;
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
retrievalFn(filter).then(timepointData => { retrievalFn(filter).then(timepointData => {
OHIF.log.info('Timepoint data retrieval'); OHIF.log.info('Timepoint data retrieval');
OHIF.log.info(timepointData);
_.each(timepointData, timepoint => { _.each(timepointData, timepoint => {
delete timepoint._id; delete timepoint._id;
this.timepoints.insert(timepoint); const query = {
timepointId: timepoint.timepointId
};
this.timepoints.update(query, {
$set: timepoint
}, {
upsert: true
});
}); });
resolve(); resolve();
}).catch(reason => {
OHIF.log.error(`Timepoint retrieval function failed: ${reason}`);
}); });
}); });
} }

1
Packages/ohif-measurements/client/components/association/associationModal/studyAssociationTable/studyAssociationTable.styl
View File

@ -65,6 +65,7 @@ $bodyCellHeight = 30px
&.timepointOptions &.timepointOptions
label label
font-weight: 200 font-weight: 200
cursor: pointer
input input
margin: 0 3px margin: 0 3px

2
Packages/ohif-measurements/client/components/caseProgress/caseProgress.js
View File

@ -27,7 +27,7 @@ Template.caseProgress.onCreated(() => {
promise.then(successHandler).catch(errorHandler); promise.then(successHandler).catch(errorHandler);
OHIF.ui.showDialog('dialogLoading', { OHIF.ui.showDialog('dialogLoading', {
promise, promise,
text: 'Saving measurements data' text: 'Saving measurement data'
}); });
return promise; return promise;

1
Packages/ohif-measurements/client/lib/MeasurementHandlers.js
View File

@ -107,6 +107,7 @@ class MeasurementHandlers {
Collection._c2._simpleSchema.clean(measurement); Collection._c2._simpleSchema.clean(measurement);
// Insert the new measurement into the collection // Insert the new measurement into the collection
console.log(measurement);
Collection.update(measurementId, { Collection.update(measurementId, {
$set: measurement $set: measurement
}); });

2
Packages/ohif-measurements/package.js
View File

@ -1,6 +1,6 @@
Npm.depends({ Npm.depends({
ajv: '4.10.4', ajv: '4.10.4',
jspdf: '1.3.2' jspdf: '1.3.3'
}); });
Package.describe({ Package.describe({

5
Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
View File

@ -138,8 +138,8 @@ function search() {
patientId: getFilter($('input#patientId').val()), patientId: getFilter($('input#patientId').val()),
accessionNumber: getFilter($('input#accessionNumber').val()), accessionNumber: getFilter($('input#accessionNumber').val()),
studyDescription: getFilter($('input#studyDescription').val()), studyDescription: getFilter($('input#studyDescription').val()),
studyDateFrom: studyDateFrom, studyDateFrom,
studyDateTo: studyDateTo, studyDateTo,
modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : '' modalitiesInStudy: $('input#modality').val() ? $('input#modality').val() : ''
}; };
@ -161,6 +161,7 @@ function search() {
Session.set('showLoadingText', false); Session.set('showLoadingText', false);
if (!studies) { if (!studies) {
OHIF.log.warn('No studies found');
return; return;
} }

2
Packages/ohif-study-list/client/components/studylist/studylistStudy/studylistStudy.js
View File

@ -1,6 +1,6 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Blaze } from 'meteor/blaze'; import { Blaze } from 'meteor/blaze';
import * as Hammer from 'hammerjs'; import Hammer from 'hammerjs';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
// Clear all selected studies // Clear all selected studies

21
Packages/ohif-study-list/client/lib/retrieveStudyMetadata.js
View File

@ -33,6 +33,17 @@ OHIF.studylist.retrieveStudyMetadata = studyInstanceUid => {
Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) { Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
console.timeEnd('retrieveStudyMetadata'); console.timeEnd('retrieveStudyMetadata');
if (error) {
OHIF.log.error(error);
reject(error);
return;
}
if (!study) {
reject(`GetStudyMetadata: No study data returned from server: ${studyInstanceUid}`);
return;
}
if (window.HipaaLogger && Meteor.user && Meteor.user()) { if (window.HipaaLogger && Meteor.user && Meteor.user()) {
window.HipaaLogger.logEvent({ window.HipaaLogger.logEvent({
eventType: 'viewed', eventType: 'viewed',
@ -45,16 +56,6 @@ OHIF.studylist.retrieveStudyMetadata = studyInstanceUid => {
}); });
} }
if (error) {
OHIF.log.warn(error);
reject(error);
return;
}
if (!study) {
throw new Meteor.Error('GetStudyMetadata', 'No study data returned from server');
}
// Once the data was retrieved, the series are sorted by series and instance number // Once the data was retrieved, the series are sorted by series and instance number
OHIF.viewerbase.sortStudy(study); OHIF.viewerbase.sortStudy(study);

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

@ -5,7 +5,7 @@ Package.describe({
}); });
Npm.depends({ Npm.depends({
hammerjs: '2.0.6' hammerjs: '2.0.8'
}); });
Package.onUse(function(api) { Package.onUse(function(api) {

5
Packages/ohif-viewerbase/client/components/basic/errorText/errorText.html Normal file
View File

@ -0,0 +1,5 @@
<template name="errorText">
<div class="errorTextDiv">
Error: {{ error }}
</div>
</template>

4
Packages/ohif-viewerbase/client/components/basic/errorText/errorText.styl Normal file
View File

@ -0,0 +1,4 @@
.errorTextDiv
font-weight: 300
padding: 30px
text-align: center

5
Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
View File

@ -35,6 +35,7 @@ Template.imageThumbnail.onRendered(() => {
const element = $element.get(0); const element = $element.get(0);
instance.refreshImage = () => { instance.refreshImage = () => {
console.log('imageThumbnail refreshImage');
if (!element) { if (!element) {
return; return;
} }
@ -84,16 +85,14 @@ Template.imageThumbnail.onRendered(() => {
}); });
Template.imageThumbnail.onDestroyed(() => { Template.imageThumbnail.onDestroyed(() => {
console.log('imagethumbnail onDestroyed');
const instance = Template.instance(); const instance = Template.instance();
// Declare DOM and jQuery objects // Declare DOM and jQuery objects
const $parent = instance.$('.imageThumbnail'); const $parent = instance.$('.imageThumbnail');
const $element = $parent.find('.imageThumbnailCanvas'); const $element = $parent.find('.imageThumbnailCanvas');
const element = $element.get(0); const element = $element.get(0);
if (element) {
cornerstone.disable(element); cornerstone.disable(element);
}
}); });
Template.imageThumbnail.helpers({ Template.imageThumbnail.helpers({

11
Packages/ohif-viewerbase/client/lib/StackManager.js
View File

@ -26,8 +26,8 @@ function createAndAddStack(stackMap, study, displaySet) {
const metaData = { const metaData = {
instance: image, // in this context, instance will be the data of the InstanceMetadata object... instance: image, // in this context, instance will be the data of the InstanceMetadata object...
series: displaySet, // TODO: Check this series: displaySet, // TODO: Check this
study: study, study,
numImages: numImages, numImages,
imageIndex: imageIndex + 1 imageIndex: imageIndex + 1
}; };
@ -40,8 +40,7 @@ function createAndAddStack(stackMap, study, displaySet) {
imageIds.push(imageId); imageIds.push(imageId);
metadataProvider.addMetadata(imageId, metaData); metadataProvider.addMetadata(imageId, metaData);
} }
} } else {
else {
imageId = getImageId(image); imageId = getImageId(image);
imageIds.push(imageId); imageIds.push(imageId);
metadataProvider.addMetadata(imageId, metaData); metadataProvider.addMetadata(imageId, metaData);
@ -50,7 +49,7 @@ function createAndAddStack(stackMap, study, displaySet) {
const stack = { const stack = {
displaySetInstanceUid: displaySet.displaySetInstanceUid, displaySetInstanceUid: displaySet.displaySetInstanceUid,
imageIds: imageIds, imageIds,
frameRate: displaySet.frameRate, frameRate: displaySet.frameRate,
isClip: displaySet.isClip isClip: displaySet.isClip
}; };
@ -61,7 +60,7 @@ function createAndAddStack(stackMap, study, displaySet) {
} }
configuration = { configuration = {
createAndAddStack: createAndAddStack createAndAddStack
}; };
/** /**

1
Packages/ohif-viewerbase/client/lib/classes/ResizeViewportManager.js
View File

@ -7,7 +7,6 @@ import { getInstanceClassDefaultViewport } from '../instanceClassSpecificViewpor
export class ResizeViewportManager { export class ResizeViewportManager {
constructor() { constructor() {
this._resizeHandler = null; this._resizeHandler = null;
OHIF.log.info('ResizeViewportManager');
} }
// Reposition Study Series Quick Switch based whether side bars are opened or not // Reposition Study Series Quick Switch based whether side bars are opened or not

12
Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js
View File

@ -118,12 +118,12 @@ class DICOMFileLoadingListener extends BaseLoadingListener {
this.stopListening(); this.stopListening();
$(cornerstone).on(imageLoadProgressEventName, imageLoadProgressEventHandle); $(cornerstone.events).on(imageLoadProgressEventName, imageLoadProgressEventHandle);
} }
stopListening() { stopListening() {
const imageLoadProgressEventName = this._getImageLoadProgressEventName(); const imageLoadProgressEventName = this._getImageLoadProgressEventName();
$(cornerstone).off(imageLoadProgressEventName); $(cornerstone.events).off(imageLoadProgressEventName);
} }
_imageLoadProgressEventHandle(e, eventData) { _imageLoadProgressEventHandle(e, eventData) {
@ -241,16 +241,16 @@ class StackLoadingListener extends BaseLoadingListener {
this.stopListening(); this.stopListening();
$(cornerstone).on(imageLoadedEventName, imageLoadedEventHandle); $(cornerstone.events).on(imageLoadedEventName, imageLoadedEventHandle);
$(cornerstone).on(imageCachePromiseRemovedEventName, imageCachePromiseRemovedEventHandle); $(cornerstone.events).on(imageCachePromiseRemovedEventName, imageCachePromiseRemovedEventHandle);
} }
stopListening() { stopListening() {
const imageLoadedEventName = this._getImageLoadedEventName(); const imageLoadedEventName = this._getImageLoadedEventName();
const imageCachePromiseRemovedEventName = this._getImageCachePromiseRemoveEventName(); const imageCachePromiseRemovedEventName = this._getImageCachePromiseRemoveEventName();
$(cornerstone).off(imageLoadedEventName); $(cornerstone.events).off(imageLoadedEventName);
$(cornerstone).off(imageCachePromiseRemovedEventName); $(cornerstone.events).off(imageCachePromiseRemovedEventName);
} }
_updateFrameStatus(imageId, loaded) { _updateFrameStatus(imageId, loaded) {

10
Packages/ohif-viewerbase/client/lib/classes/StudyPrefetcher.js
View File

@ -13,12 +13,12 @@ export class StudyPrefetcher {
this.prefetchDisplaySetsTimeout = 300; this.prefetchDisplaySetsTimeout = 300;
this.lastActiveViewportElement = null; this.lastActiveViewportElement = null;
$(cornerstone).on('CornerstoneImageCacheFull.StudyPrefetcher', _.bind(this.cacheFullHandler, this)); $(cornerstone.events).on('CornerstoneImageCacheFull.StudyPrefetcher', _.bind(this.cacheFullHandler, this));
} }
destroy() { destroy() {
this.stopPrefetching(); this.stopPrefetching();
$(cornerstone).off('CornerstoneImageCacheFull.StudyPrefetcher'); $(cornerstone.events).off('CornerstoneImageCacheFull.StudyPrefetcher');
} }
static getInstance() { static getInstance() {
@ -162,7 +162,7 @@ export class StudyPrefetcher {
getStudy(image) { getStudy(image) {
const studyMetadata = cornerstoneTools.metaData.get('study', image.imageId); 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) { getSeries(study, image) {
@ -191,6 +191,10 @@ export class StudyPrefetcher {
} }
const study = this.getStudy(image); const study = this.getStudy(image);
if (!study.seriesList || !study.seriesList.length) {
console.error(study);
}
const series = this.getSeries(study, image); const series = this.getSeries(study, image);
const instance = this.getInstance(series, image); const instance = this.getInstance(series, image);
const displaySets = study.displaySets; const displaySets = study.displaySets;

7
Packages/ohif-viewerbase/client/lib/renderViewer.js
View File

@ -22,5 +22,12 @@ export const renderViewer = (context, params, layoutTemplate='app') => {
studies studies
} }
}); });
}).catch(error => {
context.render(layoutTemplate, {
data: {
template: 'errorText',
error
}
});
}); });
}; };

4
Packages/ohif-viewerbase/client/lib/toolManager.js
View File

@ -235,8 +235,8 @@ export const toolManager = {
// Whenever the CornerstoneImageLoadProgress is fired, identify which viewports // Whenever the CornerstoneImageLoadProgress is fired, identify which viewports
// the "in-progress" image is to be displayed in. Then pass the percent complete // the "in-progress" image is to be displayed in. Then pass the percent complete
// via the Meteor Session to the other templates to be displayed in the relevant viewports. // via the Meteor Session to the other templates to be displayed in the relevant viewports.
$(cornerstone).on('CornerstoneImageLoadProgress', (e, eventData) => { $(cornerstone.events).on('CornerstoneImageLoadProgress', (e, eventData) => {
const viewportIndices = this.getKeysByValue(window.ViewportLoading, eventData.imageId); viewportIndices = this.getKeysByValue(window.ViewportLoading, eventData.imageId);
viewportIndices.forEach(viewportIndex => { viewportIndices.forEach(viewportIndex => {
Session.set('CornerstoneLoadProgress' + viewportIndex, eventData.percentComplete); Session.set('CornerstoneLoadProgress' + viewportIndex, eventData.percentComplete);
}); });

2
Packages/ohif-viewerbase/package.js
View File

@ -95,6 +95,8 @@ Package.onUse(function(api) {
api.addFiles('client/components/basic/layout/layout.styl', 'client'); api.addFiles('client/components/basic/layout/layout.styl', 'client');
api.addFiles('client/components/basic/loadingText/loadingText.html', 'client'); api.addFiles('client/components/basic/loadingText/loadingText.html', 'client');
api.addFiles('client/components/basic/loadingText/loadingText.styl', 'client'); api.addFiles('client/components/basic/loadingText/loadingText.styl', 'client');
api.addFiles('client/components/basic/errorText/errorText.html', 'client');
api.addFiles('client/components/basic/errorText/errorText.styl', 'client');
api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.html', 'client'); api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.html', 'client');
api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.styl', 'client'); api.addFiles('client/components/basic/removableBackdrop/removableBackdrop.styl', 'client');

2
StandaloneViewer/StandaloneViewer/.meteor/versions
View File

@ -90,8 +90,6 @@ ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1 ohif:wadoproxy@0.0.1
ordered-dict@1.0.9 ordered-dict@1.0.9
peppelg:bootstrap-3-modal@1.0.4 peppelg:bootstrap-3-modal@1.0.4
practicalmeteor:chai@2.1.0_1
practicalmeteor:loglevel@1.2.0_2
promise@0.8.8 promise@0.8.8
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
random@1.0.10 random@1.0.10

310
StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js
View File

@ -1,36 +1,146 @@
/*! cornerstoneWebImageLoader - v0.6.0 - 2016-02-09 | (c) 2015 Chris Hafey | https://github.com/chafey/cornerstoneWebImageLoader */ /*! cornerstone-web-image-loader - 0.8.1 - 2017-06-08 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWebImageLoader */
cornerstoneWebImageLoader = {}; (function webpackUniversalModuleDefinition(root, factory) {
// if(typeof exports === 'object' && typeof module === 'object')
// This is a cornerstone image loader for web images such as PNG and JPEG module.exports = factory(require("cornerstone-core"));
// else if(typeof define === 'function' && define.amd)
define("cornerstoneWebImageLoader", ["cornerstone-core"], factory);
else if(typeof exports === 'object')
exports["cornerstoneWebImageLoader"] = factory(require("cornerstone-core"));
else
root["cornerstoneWebImageLoader"] = factory(root["cornerstone"]);
})(this, function(__WEBPACK_EXTERNAL_MODULE_0__) {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // identity function for calling harmony imports with the correct context
/******/ __webpack_require__.i = function(value) { return value; };
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, {
/******/ configurable: false,
/******/ enumerable: true,
/******/ get: getter
/******/ });
/******/ }
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 4);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports) {
(function ($, cornerstone, cornerstoneWebImageLoader) { module.exports = __WEBPACK_EXTERNAL_MODULE_0__;
/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {
"use strict"; "use strict";
var canvas = document.createElement('canvas');
var lastImageIdDrawn = "";
Object.defineProperty(exports, "__esModule", {
value: true
});
var options = { exports.default = function (arrayBuffer) {
// callback allowing customization of the xhr (e.g. adding custom auth headers, cors, etc) var deferred = $.Deferred();
beforeSend : function(xhr) {}
var image = new Image();
var arrayBufferView = new Uint8Array(arrayBuffer);
var blob = new Blob([arrayBufferView]);
var urlCreator = window.URL || window.webkitURL;
var imageUrl = urlCreator.createObjectURL(blob);
image.src = imageUrl;
image.onload = function () {
deferred.resolve(image);
urlCreator.revokeObjectURL(imageUrl);
};
image.onerror = function (err) {
urlCreator.revokeObjectURL(imageUrl);
deferred.reject(err);
}; };
function createImageObject(image, imageId) return deferred.promise();
{ };
/***/ }),
/* 2 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = function (image, imageId) {
// extract the attributes we need // extract the attributes we need
var rows = image.naturalHeight; var rows = image.naturalHeight;
var columns = image.naturalWidth; var columns = image.naturalWidth;
function getPixelData() function getPixelData() {
{
var imageData = getImageData(); var imageData = getImageData();
var imageDataData = imageData.data; var imageDataData = imageData.data;
var numPixels = image.naturalHeight * image.naturalWidth; var numPixels = image.naturalHeight * image.naturalWidth;
var storedPixelData = new Uint8Array(numPixels * 4); var storedPixelData = new Uint8Array(numPixels * 4);
var imageDataIndex = 0; var imageDataIndex = 0;
var storedPixelDataIndex = 0; var storedPixelDataIndex = 0;
for (var i = 0; i < numPixels; i++) { for (var i = 0; i < numPixels; i++) {
storedPixelData[storedPixelDataIndex++] = imageDataData[imageDataIndex++]; storedPixelData[storedPixelDataIndex++] = imageDataData[imageDataIndex++];
storedPixelData[storedPixelDataIndex++] = imageDataData[imageDataIndex++]; storedPixelData[storedPixelDataIndex++] = imageDataData[imageDataIndex++];
@ -38,27 +148,27 @@ cornerstoneWebImageLoader = {};
storedPixelData[storedPixelDataIndex++] = 255; // alpha storedPixelData[storedPixelDataIndex++] = 255; // alpha
imageDataIndex++; imageDataIndex++;
} }
return storedPixelData; return storedPixelData;
} }
function getImageData() function getImageData() {
{ var context = void 0;
var context;
if(lastImageIdDrawn !== imageId) { if (lastImageIdDrawn === imageId) {
context = canvas.getContext('2d');
} else {
canvas.height = image.naturalHeight; canvas.height = image.naturalHeight;
canvas.width = image.naturalWidth; canvas.width = image.naturalWidth;
context = canvas.getContext('2d'); context = canvas.getContext('2d');
context.drawImage(image, 0, 0); context.drawImage(image, 0, 0);
lastImageIdDrawn = imageId; lastImageIdDrawn = imageId;
} }
else {
context = canvas.getContext('2d');
}
return context.getImageData(0, 0, image.naturalWidth, image.naturalHeight); return context.getImageData(0, 0, image.naturalWidth, image.naturalHeight);
} }
function getCanvas() function getCanvas() {
{
if (lastImageIdDrawn === imageId) { if (lastImageIdDrawn === imageId) {
return canvas; return canvas;
} }
@ -66,13 +176,14 @@ cornerstoneWebImageLoader = {};
canvas.height = image.naturalHeight; canvas.height = image.naturalHeight;
canvas.width = image.naturalWidth; canvas.width = image.naturalWidth;
var context = canvas.getContext('2d'); var context = canvas.getContext('2d');
context.drawImage(image, 0, 0); context.drawImage(image, 0, 0);
lastImageIdDrawn = imageId; lastImageIdDrawn = imageId;
return canvas; return canvas;
} }
function getImage() function getImage() {
{
return image; return image;
} }
@ -85,7 +196,7 @@ cornerstoneWebImageLoader = {};
intercept: 0, intercept: 0,
windowCenter: 128, windowCenter: 128,
windowWidth: 255, windowWidth: 255,
render: cornerstone.renderColorImage, render: cornerstone.renderWebImage,
getPixelData: getPixelData, getPixelData: getPixelData,
getImageData: getImageData, getImageData: getImageData,
getCanvas: getCanvas, getCanvas: getCanvas,
@ -101,46 +212,94 @@ cornerstoneWebImageLoader = {};
invert: false, invert: false,
sizeInBytes: rows * columns * 4 // we don't know for sure so we over estimate to be safe sizeInBytes: rows * columns * 4 // we don't know for sure so we over estimate to be safe
}; };
} };
var _cornerstoneCore = __webpack_require__(0);
var cornerstone = _interopRequireWildcard(_cornerstoneCore);
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
var canvas = document.createElement('canvas');
var lastImageIdDrawn = '';
/**
* creates a cornerstone Image object for the specified Image and imageId
*
* @param image - An Image
* @param imageId - the imageId for this image
* @returns Cornerstone Image Object
*/
/***/ }),
/* 3 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.loadImage = loadImage;
exports.configure = configure;
var _cornerstoneCore = __webpack_require__(0);
var cornerstone = _interopRequireWildcard(_cornerstoneCore);
var _arrayBufferToImage = __webpack_require__(1);
var _arrayBufferToImage2 = _interopRequireDefault(_arrayBufferToImage);
var _createImage = __webpack_require__(2);
var _createImage2 = _interopRequireDefault(_createImage);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
//
// This is a cornerstone image loader for web images such as PNG and JPEG
//
var options = {
// callback allowing customization of the xhr (e.g. adding custom auth headers, cors, etc)
beforeSend: function beforeSend() /* xhr */{}
};
// Loads an image given a url to an image // Loads an image given a url to an image
function loadImage(imageId) { function loadImage(imageId) {
// create a deferred object
var deferred = $.Deferred(); var deferred = $.Deferred();
var image = new Image();
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open("GET", imageId, true);
xhr.responseType = "arraybuffer"; xhr.open('GET', imageId, true);
xhr.responseType = 'arraybuffer';
options.beforeSend(xhr); options.beforeSend(xhr);
xhr.onload = function () { xhr.onload = function () {
var arrayBufferView = new Uint8Array(this.response); var imagePromise = (0, _arrayBufferToImage2.default)(this.response);
var blob = new Blob([arrayBufferView], {type: "image/jpeg"});
var urlCreator = window.URL || window.webkitURL; imagePromise.then(function (image) {
var imageUrl = urlCreator.createObjectURL(blob); var imageObject = (0, _createImage2.default)(image, imageId);
image.src = imageUrl;
image.onload = function() {
var imageObject = createImageObject(image, imageId);
deferred.resolve(imageObject); deferred.resolve(imageObject);
urlCreator.revokeObjectURL(imageUrl); }, function (error) {
}; deferred.reject(error);
image.onerror = function() { });
urlCreator.revokeObjectURL(imageUrl);
deferred.reject();
};
}; };
xhr.onprogress = function (oProgress) { xhr.onprogress = function (oProgress) {
if (oProgress.lengthComputable) { //evt.loaded the bytes browser receive if (oProgress.lengthComputable) {
// evt.loaded the bytes browser receive
// evt.total the total bytes seted by the header // evt.total the total bytes seted by the header
// //
var loaded = oProgress.loaded; var loaded = oProgress.loaded;
var total = oProgress.total; var total = oProgress.total;
var percentComplete = Math.round((loaded / total)*100); var percentComplete = Math.round(loaded / total * 100);
$(cornerstone).trigger('CornerstoneImageLoadProgress', { $(cornerstone.events).trigger('CornerstoneImageLoadProgress', {
imageId: imageId, imageId: imageId,
loaded: loaded, loaded: loaded,
total: total, total: total,
@ -149,6 +308,7 @@ cornerstoneWebImageLoader = {};
} }
}; };
xhr.send(); xhr.send();
return deferred.promise(); return deferred.promise();
} }
@ -156,9 +316,47 @@ cornerstoneWebImageLoader = {};
options = opts; options = opts;
} }
// steam the http and https prefixes so we can use standard web urls directly /***/ }),
cornerstone.registerImageLoader('http', loadImage); /* 4 */
cornerstone.registerImageLoader('https', loadImage); /***/ (function(module, exports, __webpack_require__) {
cornerstoneWebImageLoader.configure = configure;
return cornerstone; "use strict";
}($, cornerstone, cornerstoneWebImageLoader));
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.configure = exports.loadImage = exports.createImage = exports.arrayBufferToImage = undefined;
var _arrayBufferToImage = __webpack_require__(1);
var _arrayBufferToImage2 = _interopRequireDefault(_arrayBufferToImage);
var _createImage = __webpack_require__(2);
var _createImage2 = _interopRequireDefault(_createImage);
var _loadImage = __webpack_require__(3);
var _cornerstoneCore = __webpack_require__(0);
var cornerstone = _interopRequireWildcard(_cornerstoneCore);
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
exports.arrayBufferToImage = _arrayBufferToImage2.default;
exports.createImage = _createImage2.default;
exports.loadImage = _loadImage.loadImage;
exports.configure = _loadImage.configure;
// Register the http and https prefixes so we can use standard web urls directly
cornerstone.registerImageLoader('http', _loadImage.loadImage);
cornerstone.registerImageLoader('https', _loadImage.loadImage);
/***/ })
/******/ ]);
});
//# sourceMappingURL=cornerstoneWebImageLoader.js.map