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

Fix Standalone Viewer

Browse Source
This commit is contained in:
Erik Ziegler 2017-06-13 15:54:04 +02:00
parent 5cec053b8d
commit b966f35cf8
10 changed files with 88 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LesionTracker/client/components/viewer/viewer.js
View File

@ -110,7 +110,14 @@ Template.viewer.onCreated(() => {
instance.data.studies.forEach(study => { instance.data.studies.forEach(study => {
const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid); 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; study.selected = true;
OHIF.viewer.Studies.insert(study); OHIF.viewer.Studies.insert(study);

2
OHIFViewer/client/components/viewer/viewer.js
View File

@ -120,7 +120,7 @@ Template.viewer.onCreated(() => {
const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid); const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid);
let displaySets = study.displaySets; let displaySets = study.displaySets;
if(!displaySets) { if(!study.displaySets) {
displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata); displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
study.displaySets = displaySets; study.displaySets = displaySets;
} }

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

@ -104,7 +104,7 @@ Template.dialogStudyAssociation.onCreated(() => {
// this Timepoint instead of creating a new one // this Timepoint instead of creating a new one
Timepoints.update(existingTimepoint._id, { Timepoints.update(existingTimepoint._id, {
$set: { $set: {
studyInstanceUids: studyInstanceUids studyInstanceUids
} }
}); });
timepointId = existingTimepoint.timepointId; timepointId = existingTimepoint.timepointId;

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

@ -13,3 +13,5 @@ notices-for-facebook-graph-api-2
1.3.0-split-minifiers-package 1.3.0-split-minifiers-package
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

22
StandaloneViewer/StandaloneViewer/.meteor/packages
View File

@ -4,19 +4,19 @@
# '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.
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
reactive-var@1.0.11 # Reactive variable for tracker reactive-var@1.0.11 # Reactive variable for tracker
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@1.3.2 # CSS minifier run for production mode standard-minifier-css@1.3.4 # CSS minifier run for production mode
standard-minifier-js@1.2.1 # JS 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. 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
shell-server@0.2.1 # Server-side component of the `meteor shell` command shell-server@0.2.3 # Server-side component of the `meteor shell` command
# OHIF Packages # OHIF Packages
ohif:polyfill ohif:polyfill
@ -29,19 +29,15 @@ ohif:metadata
ohif:study-list ohif:study-list
ohif:dicom-services ohif:dicom-services
ohif:hanging-protocols ohif:hanging-protocols
# ohif:user-management
aldeed:template-extension aldeed:template-extension
aldeed:simple-schema@1.5.3 aldeed:simple-schema@1.5.3
stylus@2.513.8 stylus@2.513.9
iron:router iron:router
session@1.1.7 session@1.1.7
u2622:persistent-session@0.4.4 u2622:persistent-session@0.4.4
practicalmeteor:loglevel reactive-dict@1.1.9
reactive-dict@1.1.8
twbs:bootstrap twbs:bootstrap
fortawesome:fontawesome fortawesome:fontawesome
mrt:moment mrt:moment
fastclick@1.0.13
peppelg:bootstrap-3-modal
random@1.0.10 random@1.0.10

2
StandaloneViewer/StandaloneViewer/.meteor/release
View File

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

100
StandaloneViewer/StandaloneViewer/.meteor/versions
View File

@ -1,36 +1,39 @@
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
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
check@1.2.4 check@1.2.5
coffeescript@1.11.1_4 coffeescript@1.11.1_4
dangrossman:bootstrap-daterangepicker@2.1.13 dangrossman:bootstrap-daterangepicker@2.1.13
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 es5-shim@4.6.15
fastclick@1.0.13 fastclick@1.0.13
@ -39,7 +42,7 @@ 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
@ -47,31 +50,31 @@ iron:dynamic-template@1.0.12
iron:layout@1.0.12 iron:layout@1.0.12
iron:location@1.0.11 iron:location@1.0.11
iron:middleware-stack@1.1.0 iron:middleware-stack@1.1.0
iron:router@1.0.13 iron:router@1.1.2
iron:url@1.0.11 iron:url@1.1.0
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.18.1
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-mongo@2.2.11_2 npm-mongo@2.2.24
observe-sequence@1.0.14 observe-sequence@1.0.16
ohif:commands@0.0.1 ohif:commands@0.0.1
ohif:core@0.0.1 ohif:core@0.0.1
ohif:cornerstone@0.0.1 ohif:cornerstone@0.0.1
@ -89,36 +92,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
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

2
StandaloneViewer/StandaloneViewer/client/cornerstoneWebImageLoader.js → StandaloneViewer/StandaloneViewer/client/compatibility/cornerstoneWebImageLoader.js
View File

@ -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) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory(require("cornerstone-core")); module.exports = factory(require("cornerstone-core"));

15
StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js
View File

@ -78,12 +78,23 @@ Template.viewer.onCreated(() => {
// Update the OHIF.viewer.Studies collection with the loaded studies // Update the OHIF.viewer.Studies collection with the loaded studies
OHIF.viewer.Studies.removeAll(); OHIF.viewer.Studies.removeAll();
// @TypeSafeStudies
// Clears OHIF.viewer.StudyMetadataList collection
OHIF.viewer.StudyMetadataList.removeAll();
OHIF.viewer.data.studyInstanceUids = []; OHIF.viewer.data.studyInstanceUids = [];
instance.data.studies.forEach(study => { 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; study.selected = true;
const studyMetadata = new OHIF.metadata.StudyMetadata(study);
study.displaySets = OHIF.viewerbase.sortingManager.getDisplaySets(studyMetadata);
OHIF.viewer.Studies.insert(study); OHIF.viewer.Studies.insert(study);
OHIF.viewer.StudyMetadataList.insert(studyMetadata);
OHIF.viewer.data.studyInstanceUids.push(study.studyInstanceUid); OHIF.viewer.data.studyInstanceUids.push(study.studyInstanceUid);
}); });
}); });

2
StandaloneViewer/StandaloneViewer/package.json
View File

@ -6,6 +6,6 @@
}, },
"dependencies": { "dependencies": {
"babel-runtime": "^6.23.0", "babel-runtime": "^6.23.0",
"meteor-node-stubs": "~0.2.0" "meteor-node-stubs": "^0.2.11"
} }
} }