From b966f35cf83ba7f2ee25ce50302b765a61ad6ea3 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Tue, 13 Jun 2017 15:54:04 +0200 Subject: [PATCH] Fix Standalone Viewer --- .../client/components/viewer/viewer.js | 9 +- OHIFViewer/client/components/viewer/viewer.js | 2 +- .../associationModal/associationModal.js | 2 +- .../.meteor/.finished-upgraders | 2 + .../StandaloneViewer/.meteor/packages | 22 ++-- .../StandaloneViewer/.meteor/release | 2 +- .../StandaloneViewer/.meteor/versions | 100 +++++++++--------- .../cornerstoneWebImageLoader.js | 2 +- .../client/components/viewer/viewer.js | 15 ++- .../StandaloneViewer/package.json | 2 +- 10 files changed, 88 insertions(+), 70 deletions(-) rename StandaloneViewer/StandaloneViewer/client/{ => compatibility}/cornerstoneWebImageLoader.js (99%) diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js index c009b8b25..8d9505242 100644 --- a/LesionTracker/client/components/viewer/viewer.js +++ b/LesionTracker/client/components/viewer/viewer.js @@ -110,7 +110,14 @@ Template.viewer.onCreated(() => { instance.data.studies.forEach(study => { const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid); - studyMetadata.setDisplaySets(study.displaySets); + let displaySets = study.displaySets; + + if(!study.displaySets) { + displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata); + study.displaySets = displaySets; + } + + studyMetadata.setDisplaySets(displaySets); study.selected = true; OHIF.viewer.Studies.insert(study); diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js index c72af29a2..3d0954693 100644 --- a/OHIFViewer/client/components/viewer/viewer.js +++ b/OHIFViewer/client/components/viewer/viewer.js @@ -120,7 +120,7 @@ Template.viewer.onCreated(() => { const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid); let displaySets = study.displaySets; - if(!displaySets) { + if(!study.displaySets) { displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata); study.displaySets = displaySets; } diff --git a/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js b/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js index 3c1d872a2..427f41d42 100644 --- a/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js +++ b/Packages/ohif-measurements/client/components/association/associationModal/associationModal.js @@ -104,7 +104,7 @@ Template.dialogStudyAssociation.onCreated(() => { // this Timepoint instead of creating a new one Timepoints.update(existingTimepoint._id, { $set: { - studyInstanceUids: studyInstanceUids + studyInstanceUids } }); timepointId = existingTimepoint.timepointId; diff --git a/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders b/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders index aa607041d..910574ce2 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders +++ b/StandaloneViewer/StandaloneViewer/.meteor/.finished-upgraders @@ -13,3 +13,5 @@ notices-for-facebook-graph-api-2 1.3.0-split-minifiers-package 1.4.0-remove-old-dev-bundle-link 1.4.1-add-shell-server-package +1.4.3-split-account-service-packages +1.5-add-dynamic-import-package diff --git a/StandaloneViewer/StandaloneViewer/.meteor/packages b/StandaloneViewer/StandaloneViewer/.meteor/packages index 8c76ec934..04c0fd345 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/packages +++ b/StandaloneViewer/StandaloneViewer/.meteor/packages @@ -4,19 +4,19 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -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 -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 reactive-var@1.0.11 # Reactive variable for tracker 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@1.3.2 # CSS minifier run for production mode -standard-minifier-js@1.2.1 # JS minifier run for production mode +standard-minifier-css@1.3.4 # CSS minifier run for production mode +standard-minifier-js@2.1.0 # JS minifier run for production mode es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers. -ecmascript@0.6.1 # Enable ECMAScript2015+ syntax in app code -shell-server@0.2.1 # Server-side component of the `meteor shell` command +ecmascript@0.8.0 # Enable ECMAScript2015+ syntax in app code +shell-server@0.2.3 # Server-side component of the `meteor shell` command # OHIF Packages ohif:polyfill @@ -29,19 +29,15 @@ ohif:metadata ohif:study-list ohif:dicom-services ohif:hanging-protocols -# ohif:user-management aldeed:template-extension aldeed:simple-schema@1.5.3 -stylus@2.513.8 +stylus@2.513.9 iron:router session@1.1.7 u2622:persistent-session@0.4.4 -practicalmeteor:loglevel -reactive-dict@1.1.8 +reactive-dict@1.1.9 twbs:bootstrap fortawesome:fontawesome mrt:moment -fastclick@1.0.13 -peppelg:bootstrap-3-modal random@1.0.10 diff --git a/StandaloneViewer/StandaloneViewer/.meteor/release b/StandaloneViewer/StandaloneViewer/.meteor/release index 61f6c675b..025f64e70 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/release +++ b/StandaloneViewer/StandaloneViewer/.meteor/release @@ -1 +1 @@ -METEOR@1.4.2.3 +METEOR@1.5 diff --git a/StandaloneViewer/StandaloneViewer/.meteor/versions b/StandaloneViewer/StandaloneViewer/.meteor/versions index 491fba7eb..a613eec21 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/versions +++ b/StandaloneViewer/StandaloneViewer/.meteor/versions @@ -1,36 +1,39 @@ -accounts-base@1.2.14 +accounts-base@1.3.0 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 +aldeed:template-extension@4.1.0 allow-deny@1.0.5 amplify@1.0.0 autoupdate@1.3.12 -babel-compiler@6.13.0 +babel-compiler@6.19.2 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@2.3.2 +blaze-html-templates@1.1.2 blaze-tools@1.0.10 -boilerplate-generator@1.0.11 +boilerplate-generator@1.1.0 caching-compiler@1.1.9 -caching-html-compiler@1.0.7 +caching-html-compiler@1.1.2 callback-hook@1.0.10 -check@1.2.4 +check@1.2.5 coffeescript@1.11.1_4 dangrossman:bootstrap-daterangepicker@2.1.13 ddp@1.2.5 -ddp-client@1.3.2 +ddp-client@1.3.4 ddp-common@1.2.8 -ddp-rate-limiter@1.0.6 -ddp-server@1.3.12 +ddp-rate-limiter@1.0.7 +ddp-server@1.3.14 deps@1.0.12 diff-sequence@1.0.7 -ecmascript@0.6.1 -ecmascript-runtime@0.3.15 +dynamic-import@0.1.1 +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 es5-shim@4.6.15 fastclick@1.0.13 @@ -39,7 +42,7 @@ geojson-utils@1.0.10 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 -http@1.2.10 +http@1.2.12 id-map@1.0.9 iron:controller@1.0.12 iron:core@1.0.11 @@ -47,31 +50,31 @@ iron:dynamic-template@1.0.12 iron:layout@1.0.12 iron:location@1.0.11 iron:middleware-stack@1.1.0 -iron:router@1.0.13 -iron:url@1.0.11 +iron:router@1.1.2 +iron:url@1.1.0 jquery@1.11.10 -launch-screen@1.1.0 +launch-screen@1.1.1 livedata@1.0.18 -localstorage@1.0.12 -logging@1.1.16 +localstorage@1.1.0 +logging@1.1.17 mdg:validation-error@0.5.1 -meteor@1.6.0 -meteor-base@1.0.4 +meteor@1.6.1 +meteor-base@1.1.0 meteor-platform@1.2.6 -minifier-css@1.2.15 -minifier-js@1.2.15 -minimongo@1.0.19 +minifier-css@1.2.16 +minifier-js@2.1.0 +minimongo@1.2.1 mobile-experience@1.0.4 -mobile-status-bar@1.0.13 -modules@0.7.7 -modules-runtime@0.7.7 -momentjs:moment@2.16.0 -mongo@1.1.14 +mobile-status-bar@1.0.14 +modules@0.9.1 +modules-runtime@0.8.0 +momentjs:moment@2.18.1 +mongo@1.1.18 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 +npm-mongo@2.2.24 +observe-sequence@1.0.16 ohif:commands@0.0.1 ohif:core@0.0.1 ohif:cornerstone@0.0.1 @@ -89,36 +92,35 @@ ohif:themes-common@0.0.1 ohif:viewerbase@0.0.1 ohif:wadoproxy@0.0.1 ordered-dict@1.0.9 -peppelg:bootstrap-3-modal@1.0.4 -promise@0.8.8 +promise@0.8.9 raix:eventemitter@0.1.3 random@1.0.10 -rate-limit@1.0.6 -reactive-dict@1.1.8 +rate-limit@1.0.8 +reactive-dict@1.1.9 reactive-var@1.0.11 reload@1.1.11 retry@1.0.9 routepolicy@1.0.12 service-configuration@1.0.11 session@1.1.7 -shell-server@0.2.1 +shell-server@0.2.3 silentcicero:jszip@0.0.4 -spacebars@1.0.13 -spacebars-compiler@1.0.13 +spacebars@1.0.15 +spacebars-compiler@1.1.2 standard-app-packages@1.0.9 -standard-minifier-css@1.3.2 -standard-minifier-js@1.2.1 -stylus@2.513.8 -templating@1.2.15 -templating-compiler@1.2.15 -templating-runtime@1.2.15 -templating-tools@1.0.5 -tracker@1.1.1 +standard-minifier-css@1.3.4 +standard-minifier-js@2.1.0 +stylus@2.513.9 +templating@1.3.2 +templating-compiler@1.3.2 +templating-runtime@1.3.2 +templating-tools@1.1.2 +tracker@1.1.3 twbs:bootstrap@3.3.6 u2622:persistent-session@0.4.4 -ui@1.0.12 +ui@1.0.13 underscore@1.0.10 -url@1.0.11 +url@1.1.0 validatejs@0.0.1 -webapp@1.3.12 +webapp@1.3.16 webapp-hashing@1.0.9 diff --git a/StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js b/StandaloneViewer/StandaloneViewer/client/compatibility/cornerstoneWebImageLoader.js similarity index 99% rename from StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js rename to StandaloneViewer/StandaloneViewer/client/compatibility/cornerstoneWebImageLoader.js index fb5f3eb85..f9362a60f 100644 --- a/StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js +++ b/StandaloneViewer/StandaloneViewer/client/compatibility/cornerstoneWebImageLoader.js @@ -1,4 +1,4 @@ -/*! cornerstone-web-image-loader - 0.8.1 - 2017-06-08 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWebImageLoader */ +/*! cornerstone-web-image-loader - 0.8.1 - 2017-06-13 | (c) 2016 Chris Hafey | https://github.com/chafey/cornerstoneWebImageLoader */ (function webpackUniversalModuleDefinition(root, factory) { if(typeof exports === 'object' && typeof module === 'object') module.exports = factory(require("cornerstone-core")); diff --git a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js index 669369ca5..6ce3f43ad 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js +++ b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js @@ -78,12 +78,23 @@ Template.viewer.onCreated(() => { // Update the OHIF.viewer.Studies collection with the loaded studies OHIF.viewer.Studies.removeAll(); + // @TypeSafeStudies + // Clears OHIF.viewer.StudyMetadataList collection + OHIF.viewer.StudyMetadataList.removeAll(); + OHIF.viewer.data.studyInstanceUids = []; instance.data.studies.forEach(study => { + const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid); + let displaySets = study.displaySets; + + if(!study.displaySets) { + displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata); + study.displaySets = displaySets; + } + study.selected = true; - const studyMetadata = new OHIF.metadata.StudyMetadata(study); - study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata); OHIF.viewer.Studies.insert(study); + OHIF.viewer.StudyMetadataList.insert(studyMetadata); OHIF.viewer.data.studyInstanceUids.push(study.studyInstanceUid); }); }); diff --git a/StandaloneViewer/StandaloneViewer/package.json b/StandaloneViewer/StandaloneViewer/package.json index ee112ac19..900542ded 100644 --- a/StandaloneViewer/StandaloneViewer/package.json +++ b/StandaloneViewer/StandaloneViewer/package.json @@ -6,6 +6,6 @@ }, "dependencies": { "babel-runtime": "^6.23.0", - "meteor-node-stubs": "~0.2.0" + "meteor-node-stubs": "^0.2.11" } }