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

wip on react transition 9

Browse Source
This commit is contained in:
Erik Ziegler 2018-12-03 22:42:53 +01:00
parent 71b49e6766
commit 33fad2f317
23 changed files with 367 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OHIFViewer/.meteor/packages
View File

@ -9,9 +9,9 @@ promise@0.11.1
stylus@2.513.13
meteor-base@1.4.0
mobile-experience@1.0.5
mongo@1.5.0
mongo@1.6.0
blaze-html-templates@1.0.4
session@1.1.7
session@1.2.0
jquery@1.11.10
tracker@1.2.0
logging@1.1.20
@ -19,12 +19,12 @@ reload@1.2.0
ejson@1.1.0
spacebars@1.0.12
check@1.3.1
ecmascript@0.11.1
ecmascript@0.12.3
reactive-var@1.0.11
reactive-dict@1.2.0
standard-minifier-css@1.4.1
standard-minifier-js@2.3.4
shell-server@0.3.1
reactive-dict@1.2.1
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
shell-server@0.4.0
# OHIF Packages
ohif:polyfill
@ -47,6 +47,6 @@ momentjs:moment@2.15.1
aldeed:simple-schema # Third party package to deal with schemas
aldeed:template-extension
cultofcoders:persistent-session
underscore
underscore@1.0.10
meteortesting:mocha
react-template-helper

2
OHIFViewer/.meteor/release
View File

@ -1 +1 @@
METEOR@1.7.0.3
METEOR@1.8.0.1

63
OHIFViewer/.meteor/versions
View File

@ -6,16 +6,16 @@ aldeed:simple-schema@1.5.4
aldeed:template-extension@4.1.0
allow-deny@1.1.0
amplify@1.0.0
autoupdate@1.4.1
babel-compiler@7.1.1
babel-runtime@1.2.2
autoupdate@1.5.0
babel-compiler@7.2.3
babel-runtime@1.3.0
base64@1.0.11
binary-heap@1.0.10
blaze@2.3.2
binary-heap@1.0.11
blaze@2.3.3
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.5.0
caching-compiler@1.1.12
boilerplate-generator@1.6.0
caching-compiler@1.2.1
caching-html-compiler@1.1.3
callback-hook@1.1.0
check@1.3.1
@ -29,22 +29,24 @@ ddp-client@2.3.3
ddp-common@1.4.0
ddp-server@2.2.0
deps@1.0.12
diff-sequence@1.1.0
dynamic-import@0.4.1
ecmascript@0.11.1
diff-sequence@1.1.1
dynamic-import@0.5.1
ecmascript@0.12.3
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.7.1
ecmascript-runtime-server@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
ejson@1.1.0
es5-shim@4.8.0
fastclick@1.0.13
fetch@0.1.0
fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.4.1
http@1.4.2
id-map@1.1.0
inter-process-messaging@0.1.0
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
@ -60,21 +62,23 @@ meteor-base@1.4.0
meteor-platform@1.2.6
meteorhacks:picker@1.0.3
meteortesting:browser-tests@1.0.0
meteortesting:mocha@1.0.0
minifier-css@1.3.1
minifier-js@2.3.5
minimongo@1.4.4
meteortesting:mocha@1.1.0
meteortesting:mocha-core@1.0.1
minifier-css@1.4.1
minifier-js@2.4.0
minimongo@1.4.5
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modern-browsers@0.1.2
modules@0.12.2
modules-runtime@0.10.2
modern-browsers@0.1.3
modules@0.13.0
modules-runtime@0.10.3
momentjs:moment@2.22.2
mongo@1.5.1
mongo@1.6.0
mongo-decimal@0.1.0
mongo-dev-server@1.1.0
mongo-id@1.0.7
natestrauser:select2@4.0.3
npm-mongo@3.0.7
npm-mongo@3.1.1
observe-sequence@1.0.16
ohif:commands@0.0.1
ohif:core@0.0.1
@ -99,25 +103,24 @@ ohif:user-oidc@0.0.1
ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1
ordered-dict@1.1.0
practicalmeteor:mocha-core@1.0.1
promise@0.11.1
raix:eventemitter@0.1.3
random@1.1.0
react-template-helper@0.2.11
reactive-dict@1.2.0
reactive-dict@1.2.1
reactive-var@1.0.11
reload@1.2.0
retry@1.1.0
routepolicy@1.0.13
session@1.1.7
shell-server@0.3.1
routepolicy@1.1.0
session@1.2.0
shell-server@0.4.0
silentcicero:jszip@0.0.4
socket-stream-client@0.2.2
spacebars@1.0.15
spacebars-compiler@1.1.3
standard-app-packages@1.0.9
standard-minifier-css@1.4.1
standard-minifier-js@2.3.4
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
stylus@2.513.14
templating@1.3.2
templating-compiler@1.3.3
@ -128,5 +131,5 @@ tracker@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
webapp@1.6.2
webapp@1.7.2
webapp-hashing@1.0.9

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

@ -76,7 +76,7 @@ Meteor.startup(() => {
const metadataProvider = OHIF.viewer.metadataProvider;
cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
// Instanciate viewer plugins
// Instantiate viewer plugins
OHIF.viewer.measurementTable = new MeasurementTable();
});

20
OHIFViewer/package-lock.json generated
View File

@ -5,12 +5,11 @@
"requires": true,
"dependencies": {
"@babel/runtime": {
"version": "7.0.0-beta.51",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.51.tgz",
"integrity": "sha1-SLjtGDBwNMZiD2Q1FGUMoszAFlo=",
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz",
"integrity": "sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==",
"requires": {
"core-js": "^2.5.7",
"regenerator-runtime": "^0.11.1"
"regenerator-runtime": "^0.12.0"
}
},
"agent-base": {
@ -68,11 +67,6 @@
"typedarray": "^0.0.6"
}
},
"core-js": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
"integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
},
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@ -444,9 +438,9 @@
}
},
"regenerator-runtime": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
"integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
},
"resolve-pathname": {
"version": "2.2.0",

2
OHIFViewer/package.json
View File

@ -4,7 +4,7 @@
"description": "",
"main": "index.js",
"dependencies": {
"@babel/runtime": "7.0.0-beta.51",
"@babel/runtime": "^7.2.0",
"lodash.clonedeep": "^4.5.0",
"lodash.debounce": "^4.0.8",
"loglevel": "^1.6.1",

2
Packages/ohif-hanging-protocols/client/protocolStore/defaultStrategy.js
View File

@ -307,3 +307,5 @@ if (Meteor.settings &&
HP.ProtocolStore.setStrategy(defaultStrategy);
}
HP.clientOnlyStrategy = clientOnlyStrategy;

4
Packages/ohif-viewerbase/client/components/viewer/ViewerMain/ViewerMain.js
View File

@ -49,12 +49,12 @@ class ViewerMain extends Component {
const { studies } = this.props;
this.studyPrefetcher = StudyPrefetcher.getInstance();
this.studyPrefetcher.setStudies(studies);
this.studyLoadingListener = StudyLoadingListener.getInstance();
this.studyLoadingListener.clear();
this.studyLoadingListener.addStudies(studies);
OHIF.viewerbase.layoutManager = new LayoutManager(this.setContents, studies);
this.studyPrefetcher.setStudies(studies);
Session.set('OHIFViewerMainRendered', Math.random());
}
@ -116,6 +116,6 @@ class ViewerMain extends Component {
ViewerMain.propTypes = {
studies: PropTypes.array.isRequired
}
};
export default ViewerMain;

4
Packages/ohif-viewerbase/client/components/viewer/ViewportOrientationMarkers/ViewportOrientationMarkers.js
View File

@ -62,6 +62,10 @@ class ViewportOrientationMarkers extends Component {
render() {
const { imageId, viewport } = this.props;
const markers = getOrientationMarkers(imageId, viewport);
if (!markers) {
return '';
}
return (
<div className="ViewportOrientationMarkers noselect">
<div className="top-mid orientation-marker">

13
Packages/ohif-viewerbase/client/lib/classes/LayoutManager.js
View File

@ -14,7 +14,7 @@ const PLUGIN_CORNERSTONE = 'cornerstone';
let isInteractingWithViewport = false;
Meteor.startup(() => {
const setInteracting = flag => {
const setInteracting = (flag) => {
isInteractingWithViewport = flag;
};
@ -102,7 +102,7 @@ export class LayoutManager {
// Get all the display sets for the viewer studies
let displaySets = [];
this.studies.forEach(study => {
this.studies.forEach((study) => {
study.displaySets.forEach(dSet => dSet.images.length && displaySets.push(dSet));
});
@ -174,14 +174,14 @@ export class LayoutManager {
viewportData: []
}, layoutProps);
this.viewportData.forEach(viewportData => {
this.viewportData.forEach((viewportData) => {
const viewportDataAndLayoutProps = $.extend(viewportData, layoutProps);
data.viewportData.push(viewportDataAndLayoutProps);
});
const component = viewerComponents.GridLayout;
this.setContents(component, data)
this.setContents(component, data);
this.updateSession();
@ -227,7 +227,7 @@ export class LayoutManager {
...this.layoutProps
};
this.setContents(component, data)
this.setContents(component, data);
this.updateSession();
}
@ -259,7 +259,7 @@ export class LayoutManager {
};
const component = viewerComponents.GridLayout;
this.setContents(component, data)
this.setContents(component, data);
this.isZoomed = true;
this.zoomedViewportIndex = viewportIndex;
@ -673,5 +673,4 @@ export class LayoutManager {
isMultipleLayout() {
return this.layoutProps.row !== 1 && this.layoutProps.columns !== 1;
}
}

5
StandaloneViewer/.gitignore vendored
View File

@ -1 +1,4 @@
myOutputFolder/
myOutputFolder/
node_modules
client/sha.js
client/version.js

18
StandaloneViewer/StandaloneViewer/.meteor/packages
View File

@ -6,16 +6,16 @@
meteor-base@1.4.0 # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
mongo@1.5.0 # The database Meteor supports right now
mongo@1.6.0 # 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.2.0 # Meteor's client-side reactive programming library
standard-minifier-css@1.4.1 # CSS minifier run for production mode
standard-minifier-js@2.3.4 # JS minifier run for production mode
ecmascript # Enable ECMAScript2015+ syntax in app code
shell-server@0.3.1 # Server-side component of the `meteor shell` command
standard-minifier-css@1.5.2 # CSS minifier run for production mode
standard-minifier-js@2.4.0 # JS minifier run for production mode
ecmascript@0.12.3 # Enable ECMAScript2015+ syntax in app code
shell-server@0.4.0 # Server-side component of the `meteor shell` command
# OHIF Packages
ohif:polyfill
@ -25,6 +25,7 @@ ohif:design
ohif:cornerstone
ohif:cornerstone-settings
ohif:viewerbase
ohif:hanging-protocols
ohif:metadata
ohif:study-list
ohif:measurement-table
@ -33,10 +34,11 @@ aldeed:template-extension
aldeed:simple-schema@1.5.3
stylus@=2.513.14
clinical:router
session@1.1.7
session@1.2.0
cultofcoders:persistent-session
reactive-dict@1.2.0
reactive-dict@1.2.1
fortawesome:fontawesome
mrt:moment
random@1.1.0
underscore
underscore@1.0.10
react-template-helper

2
StandaloneViewer/StandaloneViewer/.meteor/release
View File

@ -1 +1 @@
METEOR@1.7.0.3
METEOR@1.8.0.1

61
StandaloneViewer/StandaloneViewer/.meteor/versions
View File

@ -6,16 +6,16 @@ aldeed:simple-schema@1.5.4
aldeed:template-extension@4.1.0
allow-deny@1.1.0
amplify@1.0.0
autoupdate@1.4.1
babel-compiler@7.1.1
babel-runtime@1.2.2
autoupdate@1.5.0
babel-compiler@7.2.3
babel-runtime@1.3.0
base64@1.0.11
binary-heap@1.0.10
blaze@2.3.2
binary-heap@1.0.11
blaze@2.3.3
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.5.0
caching-compiler@1.1.12
boilerplate-generator@1.6.0
caching-compiler@1.2.1
caching-html-compiler@1.1.3
callback-hook@1.1.0
check@1.3.1
@ -29,22 +29,24 @@ ddp-client@2.3.3
ddp-common@1.4.0
ddp-server@2.2.0
deps@1.0.12
diff-sequence@1.1.0
dynamic-import@0.4.1
ecmascript@0.11.1
diff-sequence@1.1.1
dynamic-import@0.5.1
ecmascript@0.12.3
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.7.1
ecmascript-runtime-server@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
ejson@1.1.0
es5-shim@4.8.0
fastclick@1.0.13
fetch@0.1.0
fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.4.1
http@1.4.2
id-map@1.1.0
inter-process-messaging@0.1.0
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
@ -57,21 +59,22 @@ mdg:validation-error@0.5.1
meteor@1.9.2
meteor-base@1.4.0
meteor-platform@1.2.6
minifier-css@1.3.1
minifier-js@2.3.5
minimongo@1.4.4
minifier-css@1.4.1
minifier-js@2.4.0
minimongo@1.4.5
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modern-browsers@0.1.2
modules@0.12.2
modules-runtime@0.10.2
modern-browsers@0.1.3
modules@0.13.0
modules-runtime@0.10.3
momentjs:moment@2.18.1
mongo@1.5.1
mongo@1.6.0
mongo-decimal@0.1.0
mongo-dev-server@1.1.0
mongo-id@1.0.7
mrt:moment@2.8.1
natestrauser:select2@4.0.3
npm-mongo@3.0.7
npm-mongo@3.1.1
observe-sequence@1.0.16
ohif:commands@0.0.1
ohif:core@0.0.1
@ -98,28 +101,30 @@ ordered-dict@1.1.0
promise@0.11.1
raix:eventemitter@0.1.3
random@1.1.0
reactive-dict@1.2.0
react-template-helper@0.2.11
reactive-dict@1.2.1
reactive-var@1.0.11
reload@1.2.0
retry@1.1.0
routepolicy@1.0.13
session@1.1.7
shell-server@0.3.1
routepolicy@1.1.0
session@1.2.0
shell-server@0.4.0
silentcicero:jszip@0.0.4
socket-stream-client@0.2.2
spacebars@1.0.15
spacebars-compiler@1.1.3
standard-app-packages@1.0.9
standard-minifier-css@1.4.1
standard-minifier-js@2.3.4
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
stylus@2.513.14
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:check-npm-versions@0.3.2
tracker@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
webapp@1.6.2
webapp@1.7.2
webapp-hashing@1.0.9

2
StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.html
View File

@ -4,7 +4,7 @@
{{>studyBrowser (clone this)}}
</div>
<div class="mainContent {{#if leftSidebarOpen}}sidebar-left-open{{/if}} {{#if rightSidebarOpen}}sidebar-right-open{{/if}}">
{{>standaloneViewerMain (clone this)}}
{{> React component=ViewerMain studies=this.studies}}
</div>
<div class="sidebarMenu sidebar-right {{#if rightSidebarOpen}}sidebar-open{{/if}}">
{{> measurementLightTable (clone this)}}

5
StandaloneViewer/StandaloneViewer/client/components/flexboxLayout/flexboxLayout.js
View File

@ -1,4 +1,5 @@
import { Template } from 'meteor/templating';
import { Viewerbase } from 'meteor/ohif:viewerbase';
Template.flexboxLayout.events({
'transitionend .sidebarMenu'(event, instance) {
@ -16,5 +17,9 @@ Template.flexboxLayout.helpers({
},
rightSidebarOpen() {
return Template.instance().data.state.get('rightSidebar');
},
ViewerMain() {
return Viewerbase.components.viewer.ViewerMain;
}
});

5
StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.html
View File

@ -1,5 +0,0 @@
<template name="standaloneViewerMain">
<div class="viewerMain">
<div id='layoutManagerTarget'></div>
</div>
</template>

67
StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
View File

@ -1,67 +0,0 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { OHIF } from 'meteor/ohif:core';
import 'meteor/ohif:viewerbase';
Meteor.startup(() => {
window.ResizeViewportManager = window.ResizeViewportManager || new OHIF.viewerbase.ResizeViewportManager();
});
Template.standaloneViewerMain.onCreated(() => {
// Attach the Window resize listener
window.addEventListener('resize', window.ResizeViewportManager.getResizeHandler());
// Create the synchronizer used to update reference lines
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('cornerstonenewimage', cornerstoneTools.updateImageSynchronizer);
OHIF.viewer.metadataProvider = new OHIF.cornerstone.MetadataProvider();
// Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider;
cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
// Set the current context
OHIF.context.set('viewer');
});
Template.standaloneViewerMain.onRendered(() => {
const instance = Template.instance();
const studies = instance.data.studies;
const parentElement = instance.$('#layoutManagerTarget').get(0);
const studyPrefetcher = OHIF.viewerbase.StudyPrefetcher.getInstance();
instance.studyPrefetcher = studyPrefetcher;
instance.studyLoadingListener = OHIF.viewerbase.StudyLoadingListener.getInstance();
instance.studyLoadingListener.clear();
instance.studyLoadingListener.addStudies(studies);
OHIF.viewerbase.layoutManager = new OHIF.viewerbase.LayoutManager(parentElement, studies);
OHIF.viewerbase.layoutManager.updateViewports();
studyPrefetcher.setStudies(studies);
// Enable hotkeys
OHIF.viewerbase.hotkeyUtils.enableHotkeys();
});
Template.standaloneViewerMain.onDestroyed(() => {
// Remove the Window resize listener
window.removeEventListener('resize', window.ResizeViewportManager.getResizeHandler());
// Destroy the synchronizer used to update reference lines
OHIF.viewer.updateImageSynchronizer.destroy();
delete OHIF.viewerbase.layoutManager;
// Stop prefetching when we close the viewer
instance.studyPrefetcher.destroy();
// Destroy stack loading listeners when we close the viewer
instance.studyLoadingListener.clear();
// Clear references to all stacks in the StackManager
OHIF.viewerbase.stackManager.clearStacks();
// Reset the current context
OHIF.context.set(null);
});

26
StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.styl
View File

@ -1,26 +0,0 @@
@import "{ohif:design}/app"
.viewerMain
width: 100%
height: 100%
transition(all 0.3s ease)
#imageViewerViewports
padding-right: 0 !important // Top remove odd borders from non-existant right Sidebar
.viewportContainer
theme('border', '%s solid $uiBorderColorDark' % $viewportBorderThickness)
float: left
outline: 0 // Prevent blue outline in Chrome
&:hover
&.active
&:hover.active
outline: 0 // Prevent blue outline in Chrome
&:hover
theme('border', '%s solid $uiBorderColor' % $viewportBorderThickness)
&.active, &:hover.active
theme('border', '%s solid $uiBorderColorActive' % $viewportBorderThickness)

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

@ -8,19 +8,53 @@ import { MeasurementTable } from 'meteor/ohif:measurement-table';
import 'meteor/ohif:viewerbase';
import 'meteor/ohif:metadata';
const viewportUtils = OHIF.viewerbase.viewportUtils;
import { createStore } from 'redux';
OHIF.viewer.functionList = {
toggleCineDialog: viewportUtils.toggleCineDialog,
toggleCinePlay: viewportUtils.toggleCinePlay,
clearTools: viewportUtils.clearTools,
resetViewport: viewportUtils.resetViewport,
invert: viewportUtils.invert
};
const store = createStore(OHIF.viewerbase.redux.combinedReducer);
Session.setDefault('activeViewport', false);
Session.setDefault('leftSidebar', false);
Session.setDefault('rightSidebar', false);
// TODO[react] Use a provider when the whole tree is React
window.store = store;
HP.ProtocolStore.setStrategy(HP.clientOnlyStrategy);
Meteor.startup(() => {
Session.setDefault('leftSidebar', false);
Session.setDefault('rightSidebar', false);
OHIF.viewer.defaultTool = {
left: 'wwwc',
right: 'zoom',
middle: 'pan'
};
OHIF.viewer.refLinesEnabled = true;
OHIF.viewer.cine = {
framesPerSecond: 24,
loop: true
};
const viewportUtils = OHIF.viewerbase.viewportUtils;
OHIF.viewer.functionList = {
toggleCineDialog: viewportUtils.toggleCineDialog,
toggleCinePlay: viewportUtils.toggleCinePlay,
clearTools: viewportUtils.clearTools,
resetViewport: viewportUtils.resetViewport,
invert: viewportUtils.invert
};
// Create the synchronizer used to update reference lines
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('cornerstonenewimage', cornerstoneTools.updateImageSynchronizer);
OHIF.viewer.metadataProvider = new OHIF.cornerstone.MetadataProvider();
// Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider;
cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
// Instantiate viewer plugins
OHIF.viewer.measurementTable = new MeasurementTable();
});
/**
* Inits OHIF Hanging Protocol's onReady.
@ -46,6 +80,7 @@ const initHangingProtocol = () => {
// Sets up Hanging Protocol engine
HP.setEngine(ProtocolEngine);
Session.set('ViewerReady', true);
});
};
@ -132,7 +167,7 @@ Template.viewer.onRendered(function() {
}
});
Template.viewer.events( Object.assign({
Template.viewer.events(Object.assign({
// Viewer Events
},
MeasurementTable.measurementEvents

7
StandaloneViewer/StandaloneViewer/client/config.js
View File

@ -2,6 +2,13 @@ import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone';
import * as cornerstoneWebImageLoader from 'cornerstone-web-image-loader';
import sha from './sha.js';
import version from './version.js';
OHIF.info = {
sha,
version
};
Meteor.startup(function() {
const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1);

195
StandaloneViewer/StandaloneViewer/package-lock.json generated
View File

@ -4,33 +4,202 @@
"lockfileVersion": 1,
"dependencies": {
"@babel/runtime": {
"version": "7.0.0-beta.53",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.53.tgz",
"integrity": "sha1-nfIq40gjzon3kAYFlLg+5XLixdI=",
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz",
"integrity": "sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==",
"requires": {
"core-js": "^2.5.7",
"regenerator-runtime": "^0.12.0"
}
},
"core-js": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
"integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
},
"cornerstone-web-image-loader": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cornerstone-web-image-loader/-/cornerstone-web-image-loader-2.1.0.tgz",
"integrity": "sha512-RllTpe+NNDY5rPr9/8mjbFOpwYHrPZFuqT1wsLzoKnbapSXAWNy6waCjPVKGON0dLThLE7gihvuX/q7eSEmdsg=="
"integrity": "sha1-Orai+HvfL/uEV3U+kTlFm4epD4I="
},
"history": {
"version": "4.7.2",
"resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz",
"integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==",
"requires": {
"invariant": "^2.2.1",
"loose-envify": "^1.2.0",
"resolve-pathname": "^2.2.0",
"value-equal": "^0.4.0",
"warning": "^3.0.0"
},
"dependencies": {
"warning": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
"requires": {
"loose-envify": "^1.0.0"
}
}
}
},
"hoist-non-react-statics": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
},
"invariant": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
"requires": {
"loose-envify": "^1.0.0"
}
},
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
},
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
},
"lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
},
"lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
},
"loglevel": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
"integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po="
},
"loose-envify": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
"path-to-regexp": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
"integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
"requires": {
"isarray": "0.0.1"
}
},
"prop-types": {
"version": "15.6.2",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
"integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
"requires": {
"loose-envify": "^1.3.1",
"object-assign": "^4.1.1"
}
},
"react": {
"version": "16.6.3",
"resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz",
"integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.11.2"
}
},
"react-dom": {
"version": "16.6.3",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz",
"integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.11.2"
}
},
"react-router": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz",
"integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==",
"requires": {
"history": "^4.7.2",
"hoist-non-react-statics": "^2.5.0",
"invariant": "^2.2.4",
"loose-envify": "^1.3.1",
"path-to-regexp": "^1.7.0",
"prop-types": "^15.6.1",
"warning": "^4.0.1"
}
},
"react-router-dom": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz",
"integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==",
"requires": {
"history": "^4.7.2",
"invariant": "^2.2.4",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.1",
"react-router": "^4.3.1",
"warning": "^4.0.1"
}
},
"redux": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/redux/-/redux-4.0.1.tgz",
"integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==",
"requires": {
"loose-envify": "^1.4.0",
"symbol-observable": "^1.2.0"
}
},
"regenerator-runtime": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.0.tgz",
"integrity": "sha512-SpV2LhF5Dm9UYMEprB3WwsBnWwqTrmjrm2UZb42cl2G02WVGgx7Mg8aa9pdLEKp6hZ+/abcMc2NxKA8f02EG2w=="
"version": "0.12.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
"integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
},
"resolve-pathname": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz",
"integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg=="
},
"scheduler": {
"version": "0.11.3",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.3.tgz",
"integrity": "sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
},
"symbol-observable": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
},
"value-equal": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz",
"integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw=="
},
"warning": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.2.tgz",
"integrity": "sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==",
"requires": {
"loose-envify": "^1.0.0"
}
}
}
}

14
StandaloneViewer/StandaloneViewer/package.json
View File

@ -2,11 +2,21 @@
"name": "StandaloneViewer",
"private": true,
"scripts": {
"version": "node -p -e \"'export default \\'' + require('./package.json').version + '\\';'\" > client/version.js",
"sha": "echo \"export default '\"$(git rev-parse HEAD)\"';\" > client/sha.js",
"details": "npm run version && npm run sha",
"start": "meteor run"
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.53",
"@babel/runtime": "^7.2.0",
"cornerstone-web-image-loader": "^2.1.0",
"loglevel": "^1.6.1"
"lodash.clonedeep": "^4.5.0",
"lodash.debounce": "^4.0.8",
"loglevel": "^1.6.1",
"prop-types": "^15.6.2",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-router-dom": "^4.3.1",
"redux": "^4.0.1"
}
}