reorganize packages, start converting overall app to react (very broken at the moment)

This commit is contained in:
Erik Ziegler 2018-12-12 18:06:25 +01:00
parent 024fe1a448
commit 5f30f7bd35
479 changed files with 5364 additions and 11611 deletions

View File

@ -12,7 +12,6 @@ mobile-experience@1.0.5
mongo@1.6.0 mongo@1.6.0
blaze-html-templates@1.0.4 blaze-html-templates@1.0.4
session@1.2.0-beta181.7 session@1.2.0-beta181.7
jquery@1.11.10
tracker@1.2.0 tracker@1.2.0
logging@1.1.20 logging@1.1.20
reload@1.2.0 reload@1.2.0
@ -27,11 +26,8 @@ standard-minifier-js@2.4.0
shell-server@0.4.0 shell-server@0.4.0
# OHIF Packages # OHIF Packages
ohif:polyfill
ohif:design
ohif:core ohif:core
ohif:cornerstone ohif:cornerstone
ohif:cornerstone-settings
ohif:viewerbase ohif:viewerbase
ohif:study-list ohif:study-list
ohif:hanging-protocols ohif:hanging-protocols
@ -39,9 +35,7 @@ ohif:user-oidc
ohif:measurement-table ohif:measurement-table
fortawesome:fontawesome fortawesome:fontawesome
momentjs:moment@2.15.1
aldeed:simple-schema # Third party package to deal with schemas aldeed:simple-schema # Third party package to deal with schemas
aldeed:template-extension aldeed:template-extension
underscore@1.0.10
meteortesting:mocha
react-template-helper react-template-helper
gadicc:blaze-react-component

View File

@ -6,7 +6,7 @@ aldeed:simple-schema@1.5.4
aldeed:template-extension@4.1.0 aldeed:template-extension@4.1.0
allow-deny@1.1.0 allow-deny@1.1.0
autoupdate@1.6.0-beta181.7 autoupdate@1.6.0-beta181.7
babel-compiler@7.2.3 babel-compiler@7.2.4
babel-runtime@1.3.0 babel-runtime@1.3.0
base64@1.0.11 base64@1.0.11
binary-heap@1.0.11 binary-heap@1.0.11
@ -18,10 +18,6 @@ caching-compiler@1.2.1
caching-html-compiler@1.1.3 caching-html-compiler@1.1.3
callback-hook@1.1.0 callback-hook@1.1.0
check@1.3.1 check@1.3.1
clinical:router@2.0.19
clinical:router-location@2.1.0
clinical:router-middleware-stack@2.1.2
clinical:router-url@2.1.0
ddp@1.4.0 ddp@1.4.0
ddp-client@2.3.3 ddp-client@2.3.3
ddp-common@1.4.0 ddp-common@1.4.0
@ -29,15 +25,15 @@ ddp-server@2.3.0-beta181.7
deps@1.0.12 deps@1.0.12
diff-sequence@1.1.1 diff-sequence@1.1.1
dynamic-import@0.5.1 dynamic-import@0.5.1
ecmascript@0.12.3 ecmascript@0.12.4
ecmascript-runtime@0.7.0 ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0 ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1 ecmascript-runtime-server@0.7.1
ejson@1.1.0 ejson@1.1.0
es5-shim@4.8.0 es5-shim@4.8.0
fastclick@1.0.13
fetch@0.1.0 fetch@0.1.0
fortawesome:fontawesome@4.7.0 fortawesome:fontawesome@4.7.0
gadicc:blaze-react-component@1.4.1
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
@ -45,23 +41,13 @@ htmljs@1.0.11
http@1.4.2 http@1.4.2
id-map@1.1.0 id-map@1.1.0
inter-process-messaging@0.1.0 inter-process-messaging@0.1.0
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
iron:layout@1.0.12
jquery@1.11.11 jquery@1.11.11
launch-screen@1.1.1 launch-screen@1.1.1
livedata@1.0.18 livedata@1.0.18
lmieulet:meteor-coverage@1.1.4
logging@1.1.20 logging@1.1.20
mdg:validation-error@0.5.1 mdg:validation-error@0.5.1
meteor@1.9.2 meteor@1.9.2
meteor-base@1.4.0 meteor-base@1.4.0
meteor-platform@1.2.6
meteorhacks:picker@1.0.3
meteortesting:browser-tests@1.0.0
meteortesting:mocha@1.1.0
meteortesting:mocha-core@1.0.1
minifier-css@1.4.1 minifier-css@1.4.1
minifier-js@2.4.0 minifier-js@2.4.0
minimongo@1.4.5 minimongo@1.4.5
@ -70,7 +56,6 @@ mobile-status-bar@1.0.14
modern-browsers@0.1.4-beta181.7 modern-browsers@0.1.4-beta181.7
modules@0.13.0 modules@0.13.0
modules-runtime@0.10.3 modules-runtime@0.10.3
momentjs:moment@2.22.2
mongo@1.6.0 mongo@1.6.0
mongo-decimal@0.1.0 mongo-decimal@0.1.0
mongo-dev-server@1.1.0 mongo-dev-server@1.1.0
@ -80,22 +65,17 @@ npm-mongo@3.1.2-beta181.7
observe-sequence@1.0.16 observe-sequence@1.0.16
ohif:core@0.0.1 ohif:core@0.0.1
ohif:cornerstone@0.0.1 ohif:cornerstone@0.0.1
ohif:cornerstone-settings@0.0.1
ohif:design@0.0.1
ohif:hanging-protocols@0.0.1 ohif:hanging-protocols@0.0.1
ohif:measurement-table@0.0.1 ohif:measurement-table@0.0.1
ohif:measurements@0.0.1 ohif:measurements@0.0.1
ohif:polyfill@0.0.1
ohif:servers@0.0.1
ohif:studies@0.0.1 ohif:studies@0.0.1
ohif:study-list@0.0.1 ohif:study-list@0.0.1
ohif:themes@0.0.1 ohif:themes@0.0.1
ohif:themes-common@0.0.1 ohif:themes-common@0.0.1
ohif:user-oidc@0.0.1 ohif:user-oidc@0.0.1
ohif:viewerbase@0.0.1 ohif:viewerbase@0.0.1
ohif:wadoproxy@0.0.1
ordered-dict@1.1.0 ordered-dict@1.1.0
promise@0.11.1 promise@0.11.2
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
random@1.1.0 random@1.1.0
react-template-helper@0.2.11 react-template-helper@0.2.11
@ -106,11 +86,9 @@ retry@1.1.0
routepolicy@1.1.0 routepolicy@1.1.0
session@1.2.0 session@1.2.0
shell-server@0.4.0 shell-server@0.4.0
silentcicero:jszip@0.0.4
socket-stream-client@0.2.2 socket-stream-client@0.2.2
spacebars@1.0.15 spacebars@1.0.15
spacebars-compiler@1.1.3 spacebars-compiler@1.1.3
standard-app-packages@1.0.9
standard-minifier-css@1.5.2 standard-minifier-css@1.5.2
standard-minifier-js@2.4.0 standard-minifier-js@2.4.0
stylus@2.513.14 stylus@2.513.14

View File

@ -1,3 +0,0 @@
<body>
<div id="notificationArea" class="notification-area"></div>
</body>

View File

@ -1,2 +1,4 @@
body body
background-color: black background-color: black
height: 100%
width: 100%

View File

@ -0,0 +1,4 @@
#root {
height: 100%;
width: 100%;
}

View File

@ -1,9 +1,9 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { withRouter } from 'react-router'; import { withRouter } from 'react-router';
import { Route, Switch } from 'react-router-dom'; import { Route, Switch } from 'react-router-dom';
import SecretRoute from './SecretRoute.js';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import Provider from "react-redux/es/components/Provider"; import Viewer from "./viewer/viewer";
import './App.css';
const reload = () => window.location.reload(); const reload = () => window.location.reload();
const Studylist = OHIF.studylist.components.StudyList; const Studylist = OHIF.studylist.components.StudyList;
@ -30,27 +30,26 @@ class App extends Component {
render() { render() {
return ( return (
<Provider store={window.store}>
<Switch> <Switch>
<SecretRoute <Route
exact exact
path="/studylist" path="/studylist"
component={Studylist} component={Studylist}
auth={this.props.auth} /*auth={this.props.auth}*/
store={this.props.store} store={this.props.store}
/> />
<SecretRoute <Route
exact exact
path="/" path="/"
component={Studylist} component={Studylist}
auth={this.props.auth} /*auth={this.props.auth}*/
store={this.props.store} store={this.props.store}
/> />
<SecretRoute <Route
exact exact
path="/viewer" path="/viewer"
component={ConnectedViewer} component={Viewer}
auth={this.props.auth} /*auth={this.props.auth}*/
store={this.props.store} store={this.props.store}
/> />
{/*<Route path="/silent-refresh.html" onEnter={reload} /> {/*<Route path="/silent-refresh.html" onEnter={reload} />
@ -59,7 +58,6 @@ class App extends Component {
<div> Sorry, this page does not exist. </div>} <div> Sorry, this page does not exist. </div>}
/> />
</Switch> </Switch>
</Provider>
); );
} }
} }

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.viewerSection .viewerSection
display: flex display: flex

View File

@ -0,0 +1,23 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { BrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
import { createStore } from 'redux';
import App from './App.js';
import { OHIF } from 'meteor/ohif:core';
const store = createStore(OHIF.viewerbase.redux.combinedReducer);
// TODO[react] Use a provider when the whole tree is React
window.store = store;
Meteor.startup(() => {
ReactDOM.render(
<Provider store={store}>
<BrowserRouter>
<App store={store}/>
</BrowserRouter>
</Provider>,
document.getElementById('root')
);
});

View File

@ -1,18 +1,11 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import { Router } from 'meteor/clinical:router';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { createStore } from 'redux';
import Viewer from '../viewer/viewer.js'; import Viewer from '../viewer/viewer.js';
const store = createStore(OHIF.viewerbase.redux.combinedReducer);
// TODO[react] Use a provider when the whole tree is React
window.store = store;
Template.ohifViewer.onCreated(() => { Template.ohifViewer.onCreated(() => {
const instance = Template.instance(); const instance = Template.instance();
instance.headerClasses = new ReactiveVar(''); instance.headerClasses = new ReactiveVar('');
@ -50,7 +43,7 @@ Template.ohifViewer.onCreated(() => {
OHIF.header.dropdown.setItems(headerItems); OHIF.header.dropdown.setItems(headerItems);
instance.autorun(() => { /*instance.autorun(() => {
const currentRoute = Router.current(); const currentRoute = Router.current();
if (!currentRoute) return; if (!currentRoute) return;
const routeName = currentRoute.route.getName(); const routeName = currentRoute.route.getName();
@ -64,7 +57,7 @@ Template.ohifViewer.onCreated(() => {
// Set the viewer open state on session // Set the viewer open state on session
Session.set('ViewerOpened', isViewer); Session.set('ViewerOpened', isViewer);
}); });*/
}); });
Template.ohifViewer.events({ Template.ohifViewer.events({
@ -72,14 +65,14 @@ Template.ohifViewer.events({
event.preventDefault(); event.preventDefault();
const isViewer = Session.get('ViewerOpened'); const isViewer = Session.get('ViewerOpened');
if (isViewer) { /*if (isViewer) {
Router.go('studylist'); Router.go('studylist');
} else { } else {
const { studyInstanceUids } = OHIF.viewer.data; const { studyInstanceUids } = OHIF.viewer.data;
if (studyInstanceUids) { if (studyInstanceUids) {
Router.go('viewerStudies', { studyInstanceUids }); Router.go('viewerStudies', { studyInstanceUids });
} }
} }*/
} }
}); });

View File

@ -1,4 +1,4 @@
@import "{ohif:design}/app" @import "{ohif:viewerbase}/app"
body>.header body>.header

View File

@ -1,5 +1,5 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import 'meteor/ohif:viewerbase'; import 'meteor/ohif:viewerbase';

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.toolbarSection .toolbarSection
theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness) theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)

View File

@ -1,3 +1,6 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { MeasurementTable } from 'meteor/ohif:measurement-table'; import { MeasurementTable } from 'meteor/ohif:measurement-table';
@ -6,11 +9,7 @@ import FlexboxLayout from '../flexboxLayout/flexboxLayout.js';
import 'meteor/ohif:cornerstone'; import 'meteor/ohif:cornerstone';
import 'meteor/ohif:viewerbase'; import 'meteor/ohif:viewerbase';
import 'meteor/ohif:metadata';
import PropTypes from "prop-types";
import React, { Component } from "react";
import { Provider } from 'react-redux';
/** /**
* Inits OHIF Hanging Protocol's onReady. * Inits OHIF Hanging Protocol's onReady.
@ -82,7 +81,6 @@ class Viewer extends Component {
// Define the OHIF.viewer.data global object // Define the OHIF.viewer.data global object
OHIF.viewer.data = OHIF.viewer.data || {}; OHIF.viewer.data = OHIF.viewer.data || {};
debugger;
// @TypeSafeStudies // @TypeSafeStudies
// Clears OHIF.viewer.Studies collection // Clears OHIF.viewer.Studies collection
@ -137,7 +135,7 @@ class Viewer extends Component {
} }
Viewer.propTypes = { Viewer.propTypes = {
studies: PropTypes.array.isRequired studies: PropTypes.array
}; };
export default Viewer; export default Viewer;

View File

@ -1,4 +1,4 @@
@import "{ohif:design}/app" @import "{ohif:viewerbase}/app"
body body
background-color: black background-color: black

View File

@ -10,3 +10,6 @@
<meta name="HandheldFriendly" content="True"> <meta name="HandheldFriendly" content="True">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
</head> </head>
<body>
<div id="root"></div>
</body>

View File

@ -1,29 +1,12 @@
import { Meteor } from "meteor/meteor"; import { Meteor } from "meteor/meteor";
import { Router } from 'meteor/clinical:router'; //import { Router } from 'meteor/clinical:router';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Router.configure({ /*Router.configure({
layoutTemplate: 'layout', layoutTemplate: 'layout',
}); });
// If we are running a disconnected client similar to the StandaloneViewer
// (see https://docs.ohif.org/standalone-viewer/usage.html) we don't want
// our routes to get stuck while waiting for Pub / Sub.
//
// In this case, the developer is required to add Servers and specify
// a CurrentServer with some other approach (e.g. a separate script).
if (Meteor.settings &&
Meteor.settings.public &&
Meteor.settings.public.clientOnly !== true) {
Router.waitOn(function() {
return [
Meteor.subscribe('servers'),
Meteor.subscribe('currentServer')
];
});
}
Router.onBeforeAction('loading'); Router.onBeforeAction('loading');
Router.route('/', function() { Router.route('/', function() {
@ -66,4 +49,4 @@ Router.route('/IHEInvokeImageDisplay', function() {
} else { } else {
Router.go('studylist', {}, {replaceState: true}); Router.go('studylist', {}, {replaceState: true});
} }
}); });*/

File diff suppressed because it is too large Load Diff

View File

@ -5,16 +5,20 @@
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.2.0", "@babel/runtime": "^7.2.0",
"bootstrap": "^4.1.3",
"jquery": "3.3.1",
"lodash.clonedeep": "^4.5.0", "lodash.clonedeep": "^4.5.0",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"loglevel": "^1.6.1", "loglevel": "^1.6.1",
"popper": "^1.0.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.6.3", "react": "^16.6.3",
"react-dom": "^16.6.3", "react-dom": "^16.6.3",
"react-redux": "^6.0.0", "react-redux": "^6.0.0",
"react-router-dom": "^4.3.1", "react-router-dom": "^4.3.1",
"react-viewerbase": "git://github.com:OHIF/react-viewerbase.git", "react-viewerbase": "git://github.com:OHIF/react-viewerbase.git",
"redux": "^4.0.1" "redux": "^4.0.1",
"underscore": "1.9.1"
}, },
"devDependencies": { "devDependencies": {
"husky": "^1.2.0", "husky": "^1.2.0",

View File

@ -1,22 +0,0 @@
Package.describe({
name: 'ohif:commands',
summary: 'OHIF commands management',
version: '0.0.1'
});
Package.onUse(function(api) {
api.versionsFrom('1.7');
// Meteor packages
api.use([
'ecmascript',
'reactive-var'
]);
// OHIF dependencies
api.use('ohif:core');
api.use('ohif:log');
// Main module definition
api.mainModule('main.js', 'client');
});

View File

@ -1,4 +0,0 @@
import './lib';
import './utils';
import './schema.js';

View File

@ -1,2 +0,0 @@
import './object.js';
import './DICOMWeb/';

View File

@ -1,5 +1,5 @@
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
export class CommandsManager { export class CommandsManager {

View File

@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { Session } from 'meteor/session'; import { Session } from 'meteor/session';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { HotkeysContext } from 'meteor/ohif:hotkeys/client/classes/HotkeysContext'; import { HotkeysContext } from './HotkeysContext';
export class HotkeysManager { export class HotkeysManager {
constructor() { constructor() {

View File

@ -1,5 +1,5 @@
import { cornerstoneMath } from 'meteor/ohif:cornerstone'; import { cornerstoneMath } from 'meteor/ohif:cornerstone';
import { parsingUtils } from '../parsingUtils'; import { parsingUtils } from '../lib/parsingUtils';
const FUNCTION = 'function'; const FUNCTION = 'function';

View File

@ -0,0 +1,11 @@
import MetadataProvider from './MetadataProvider.js';
import CommandsManager from './CommandsManager.js';
import HotkeysContext from './HotkeysContext.js';
import HotkeysManager from './HotkeysManager.js';
export {
MetadataProvider,
CommandsManager,
HotkeysContext,
HotkeysManager
};

View File

@ -2,13 +2,10 @@ import { Mongo } from 'meteor/mongo';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
// CurrentServer is a single document collection to describe which of the Servers is being used // CurrentServer is a single document collection to describe which of the Servers is being used
let collectionName = 'currentServer'; const CurrentServer = new Mongo.Collection(null);
if (Meteor.settings && Meteor.settings.public && Meteor.settings.public.clientOnly === true) {
collectionName = null;
}
const CurrentServer = new Mongo.Collection(collectionName);
CurrentServer._debugName = 'CurrentServer'; CurrentServer._debugName = 'CurrentServer';
OHIF.servers = OHIF.servers || {};
OHIF.servers.collections = OHIF.servers.collections || {};
OHIF.servers.collections.currentServer = CurrentServer; OHIF.servers.collections.currentServer = CurrentServer;
export { CurrentServer }; export { CurrentServer };

View File

@ -1,5 +1,5 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
// Create an object to store all the application mixins // Create an object to store all the application mixins
OHIF.mixins = {}; OHIF.mixins = {};

View File

@ -1,5 +1,5 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
/* /*

View File

@ -1,6 +1,6 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
/* /*
* inputCheckbox: controls a checkbox input * inputCheckbox: controls a checkbox input

View File

@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Blaze } from 'meteor/blaze'; import { Blaze } from 'meteor/blaze';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
/* /*

View File

@ -2,8 +2,8 @@ import { OHIF } from 'meteor/ohif:core';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { Spacebars } from 'meteor/spacebars'; import { Spacebars } from 'meteor/spacebars';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
/* /*
* form: controls a form and its registered inputs * form: controls a form and its registered inputs

View File

@ -2,8 +2,8 @@ import { OHIF } from 'meteor/ohif:core';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
/* /*
* formItem: create a generic controller for form items * formItem: create a generic controller for form items

View File

@ -1,7 +1,7 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
/* /*
* group: controls a group and its registered items * group: controls a group and its registered items

View File

@ -1,7 +1,7 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
/* /*
* groupRadio: controls all the radio inputs inside the group * groupRadio: controls all the radio inputs inside the group

View File

@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
/* /*

View File

@ -3,7 +3,7 @@ import { Blaze } from 'meteor/blaze';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
// Helper function to get the component's current schema // Helper function to get the component's current schema
const getCurrentSchemaDefs = (parentComponent, key) => { const getCurrentSchemaDefs = (parentComponent, key) => {

View File

@ -1,8 +1,8 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
/* /*

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 { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
// Create a new custom template for the base component // Create a new custom template for the base component

View File

@ -1,5 +1,5 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Template.dialogForm.onCreated(() => { Template.dialogForm.onCreated(() => {

View File

@ -1,4 +1,4 @@
@import "{ohif:design}/app" @import "{ohif:viewerbase}/app"
.modal .loading-text .modal .loading-text
theme('color', '$textSecondaryColor') theme('color', '$textSecondaryColor')

View File

@ -1,6 +1,6 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
Template.dialogProgress.onCreated(() => { Template.dialogProgress.onCreated(() => {
const instance = Template.instance(); const instance = Template.instance();

View File

@ -1,6 +1,6 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Template.dialogSimple.onCreated(() => { Template.dialogSimple.onCreated(() => {

View File

@ -1,7 +1,7 @@
import { Blaze } from 'meteor/blaze'; import { Blaze } from 'meteor/blaze';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
const MARGIN_RIGHT = 15; const MARGIN_RIGHT = 15;
const MARGIN_BOTTOM = 15; const MARGIN_BOTTOM = 15;

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.dropdown .dropdown
cursor: default cursor: default

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.notification-area .notification-area
position: fixed position: fixed

View File

@ -1,5 +1,5 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Template.header.onCreated(() => { Template.header.onCreated(() => {

View File

@ -1,4 +1,4 @@
@import "{ohif:design}/app" @import "{ohif:viewerbase}/app"
body>.header body>.header
height: $topBarHeight height: $topBarHeight

View File

@ -1,7 +1,7 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { ReactiveVar } from 'meteor/reactive-var'; import { ReactiveVar } from 'meteor/reactive-var';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Template.hotkeysForm.onCreated(() => { Template.hotkeysForm.onCreated(() => {

View File

@ -6,4 +6,3 @@ import './pages';
import './paginationArea'; import './paginationArea';
import './playground'; import './playground';
import './scrollArea'; import './scrollArea';
import './userLogin';

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.page-error .error-stack .page-error .error-stack
display: table display: table

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.page-message .page-message
theme('color', '$textPrimaryColor') theme('color', '$textPrimaryColor')

View File

@ -1,6 +1,6 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { SimpleSchema } from 'meteor/aldeed:simple-schema'; import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
Template.paginationArea.onCreated(function() { Template.paginationArea.onCreated(function() {
const instance = Template.instance(); const instance = Template.instance();

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
.pagination-area .pagination-area
font-size: 13px font-size: 13px

View File

@ -1,5 +1,5 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Template.scrollArea.onCreated(() => { Template.scrollArea.onCreated(() => {

View File

@ -1,4 +1,4 @@
@require '{ohif:design}/app' @require '{ohif:viewerbase}/app'
$scrollNavSize = 24px $scrollNavSize = 24px

View File

@ -0,0 +1,5 @@
import { OHIF } from 'meteor/ohif:core';
import { MetadataProvider } from './classes/MetadataProvider';
OHIF.cornerstone.MetadataProvider = MetadataProvider;

View File

@ -1,4 +1,4 @@
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
/** /**

View File

@ -1,4 +1,4 @@
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';

View File

@ -1,4 +1,4 @@
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
/** /**

View File

@ -1,4 +1,4 @@
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
/** /**

View File

@ -1,5 +1,5 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
/** /**

View File

@ -1,4 +1,4 @@
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
/** /**

View File

@ -1,5 +1,5 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { HotkeysManager } from '/client/classes/HotkeysManager'; import { HotkeysManager } from './classes/HotkeysManager';
import 'jquery.hotkeys'; import 'jquery.hotkeys';
// Create hotkeys namespace using a HotkeysManager class instance // Create hotkeys namespace using a HotkeysManager class instance

View File

@ -1,13 +1,12 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { $ } from 'meteor/jquery';
import writeScript from './lib/writeScript'; import writeScript from './lib/writeScript';
// Check if browser is IE and add the polyfill scripts // Check if browser is IE and add the polyfill scripts
if (navigator && /MSIE \d|Trident.*rv:/.test(navigator.userAgent)) { if (navigator && /MSIE \d|Trident.*rv:/.test(navigator.userAgent)) {
Meteor.startup(() => { Meteor.startup(() => {
$(window).on('load', () => { window.onload = () => {
// Fix SVG+USE issues by calling the SVG polyfill // Fix SVG+USE issues by calling the SVG polyfill
writeScript('svgxuse.min.js'); writeScript('svgxuse.min.js');
}); };
}); });
} }

View File

@ -4,8 +4,9 @@ import './commands';
import './hotkeys'; import './hotkeys';
import './components'; import './components';
import './ui'; import './ui';
import './routes.js';
import './header.js'; import './header.js';
import './hotkeys.js'; import './schema.js';
import './hotkeys.js'; import './utils/';
import './startup.js';
import './classes/';
import './cornerstone.js';

View File

@ -1,5 +1,5 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
OHIF.cornerstone = {}; OHIF.cornerstone = {};

View File

@ -1,5 +1,5 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { Servers, CurrentServer } from 'meteor/ohif:servers/both/collections'; import { Servers, CurrentServer } from '../collections';
/** /**
* Retrieves the current server configuration used to retrieve studies * Retrieves the current server configuration used to retrieve studies

View File

@ -5,3 +5,6 @@ import './ui.js';
import './utils.js'; import './utils.js';
import './viewer.js'; import './viewer.js';
import './user.js'; import './user.js';
import './object.js';
import './DICOMWeb/';
import './getCurrentServer.js';

View File

@ -1,6 +1,6 @@
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
OHIF.string = {}; OHIF.string = {};

View File

@ -1,27 +0,0 @@
import { Meteor } from 'meteor/meteor';
import { $ } from 'meteor/jquery';
import { Router } from 'meteor/clinical:router';
Router.onRun(function() {
$(document.body).trigger('ohif.navigated');
this.next();
});
if (Meteor.isDevelopment) {
Router.route('/playground', function() {
this.render('componentPlayground');
});
}
import { hotkeys } from 'meteor/ohif:hotkeys';
Router.onBeforeAction(function() {
const lastRoute = Session.get('lastRoute');
const currentRoute = this.router.current().route.getName();
if (currentRoute !== lastRoute) {
hotkeys.switchToContext(null);
Session.set('lastRoute', currentRoute);
}
this.next();
});

View File

@ -1,4 +1,5 @@
import { SimpleSchema } from 'meteor/aldeed:simple-schema'; import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { Match } from 'meteor/check';
/* /*
Extend the available options on schema definitions: Extend the available options on schema definitions:

View File

@ -0,0 +1,22 @@
// Check the servers on meteor startup
import { Meteor } from "meteor/meteor";
import { Servers, CurrentServer } from './collections';
const servers = Meteor.settings.public.servers;
Object.keys(servers).forEach((serverType) => {
const endpoints = servers[serverType];
endpoints.forEach((endpoint) => {
const server = Object.assign({}, endpoint);
server.type = serverType;
Servers.insert(server);
});
});
const newServer = Servers.findOne();
CurrentServer.insert({
serverId: newServer._id
});

View File

@ -1,5 +1,5 @@
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
// Allow attaching to jQuery selectors // Allow attaching to jQuery selectors

View File

@ -1,7 +1,7 @@
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Blaze } from 'meteor/blaze'; import { Blaze } from 'meteor/blaze';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
let zIndexBackdrop = 1060; let zIndexBackdrop = 1060;

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 { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
OHIF.ui.unsavedChangesDialog = function(callback, options) { OHIF.ui.unsavedChangesDialog = function(callback, options) {

View File

@ -1,4 +1,4 @@
import { $ } from 'meteor/jquery'; import $ from 'jquery';
// Temporarily show and hide the element to enable dimension calculations // Temporarily show and hide the element to enable dimension calculations
$.fn.tempShow = function(callback) { $.fn.tempShow = function(callback) {

View File

@ -1,5 +1,5 @@
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
class Dropdown { class Dropdown {

View File

@ -1,8 +1,8 @@
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating'; import { Template } from 'meteor/templating';
import { Blaze } from 'meteor/blaze'; import { Blaze } from 'meteor/blaze';
import { $ } from 'meteor/jquery'; import $ from 'jquery';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
const Notifications = { const Notifications = {

View File

@ -1,4 +1,4 @@
import { _ } from 'meteor/underscore'; import _ from 'underscore';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
// Allow attaching to jQuery selectors // Allow attaching to jQuery selectors

View File

@ -1,4 +1,4 @@
@import "{ohif:design}/app" @import "{ohif:viewerbase}/app"
.resizable .resizable
transform(scale(1)) transform(scale(1))

View File

@ -1,6 +1,6 @@
import { Tracker } from 'meteor/tracker'; import { Tracker } from 'meteor/tracker';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
import { _ } from 'meteor/underscore'; import _ from 'underscore';
const FUNCTION = 'function'; const FUNCTION = 'function';
const STRING = 'string'; const STRING = 'string';

Some files were not shown because too many files have changed in this diff Show More