reorganize packages, start converting overall app to react (very broken at the moment)
This commit is contained in:
Erik Ziegler
parent
024fe1a448
commit
5f30f7bd35
@ -12,7 +12,6 @@ mobile-experience@1.0.5
|
||||
mongo@1.6.0
|
||||
blaze-html-templates@1.0.4
|
||||
session@1.2.0-beta181.7
|
||||
jquery@1.11.10
|
||||
tracker@1.2.0
|
||||
logging@1.1.20
|
||||
reload@1.2.0
|
||||
@ -27,11 +26,8 @@ standard-minifier-js@2.4.0
|
||||
shell-server@0.4.0
|
||||
|
||||
# OHIF Packages
|
||||
ohif:polyfill
|
||||
ohif:design
|
||||
ohif:core
|
||||
ohif:cornerstone
|
||||
ohif:cornerstone-settings
|
||||
ohif:viewerbase
|
||||
ohif:study-list
|
||||
ohif:hanging-protocols
|
||||
@ -39,9 +35,7 @@ ohif:user-oidc
|
||||
ohif:measurement-table
|
||||
|
||||
fortawesome:fontawesome
|
||||
momentjs:moment@2.15.1
|
||||
aldeed:simple-schema # Third party package to deal with schemas
|
||||
aldeed:template-extension
|
||||
underscore@1.0.10
|
||||
meteortesting:mocha
|
||||
react-template-helper
|
||||
gadicc:blaze-react-component
|
||||
|
||||
@ -6,7 +6,7 @@ aldeed:simple-schema@1.5.4
|
||||
aldeed:template-extension@4.1.0
|
||||
allow-deny@1.1.0
|
||||
autoupdate@1.6.0-beta181.7
|
||||
babel-compiler@7.2.3
|
||||
babel-compiler@7.2.4
|
||||
babel-runtime@1.3.0
|
||||
base64@1.0.11
|
||||
binary-heap@1.0.11
|
||||
@ -18,10 +18,6 @@ caching-compiler@1.2.1
|
||||
caching-html-compiler@1.1.3
|
||||
callback-hook@1.1.0
|
||||
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-client@2.3.3
|
||||
ddp-common@1.4.0
|
||||
@ -29,15 +25,15 @@ ddp-server@2.3.0-beta181.7
|
||||
deps@1.0.12
|
||||
diff-sequence@1.1.1
|
||||
dynamic-import@0.5.1
|
||||
ecmascript@0.12.3
|
||||
ecmascript@0.12.4
|
||||
ecmascript-runtime@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
|
||||
gadicc:blaze-react-component@1.4.1
|
||||
geojson-utils@1.0.10
|
||||
hot-code-push@1.0.4
|
||||
html-tools@1.0.11
|
||||
@ -45,23 +41,13 @@ htmljs@1.0.11
|
||||
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
|
||||
iron:layout@1.0.12
|
||||
jquery@1.11.11
|
||||
launch-screen@1.1.1
|
||||
livedata@1.0.18
|
||||
lmieulet:meteor-coverage@1.1.4
|
||||
logging@1.1.20
|
||||
mdg:validation-error@0.5.1
|
||||
meteor@1.9.2
|
||||
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-js@2.4.0
|
||||
minimongo@1.4.5
|
||||
@ -70,7 +56,6 @@ mobile-status-bar@1.0.14
|
||||
modern-browsers@0.1.4-beta181.7
|
||||
modules@0.13.0
|
||||
modules-runtime@0.10.3
|
||||
momentjs:moment@2.22.2
|
||||
mongo@1.6.0
|
||||
mongo-decimal@0.1.0
|
||||
mongo-dev-server@1.1.0
|
||||
@ -80,22 +65,17 @@ npm-mongo@3.1.2-beta181.7
|
||||
observe-sequence@1.0.16
|
||||
ohif:core@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:measurement-table@0.0.1
|
||||
ohif:measurements@0.0.1
|
||||
ohif:polyfill@0.0.1
|
||||
ohif:servers@0.0.1
|
||||
ohif:studies@0.0.1
|
||||
ohif:study-list@0.0.1
|
||||
ohif:themes@0.0.1
|
||||
ohif:themes-common@0.0.1
|
||||
ohif:user-oidc@0.0.1
|
||||
ohif:viewerbase@0.0.1
|
||||
ohif:wadoproxy@0.0.1
|
||||
ordered-dict@1.1.0
|
||||
promise@0.11.1
|
||||
promise@0.11.2
|
||||
raix:eventemitter@0.1.3
|
||||
random@1.1.0
|
||||
react-template-helper@0.2.11
|
||||
@ -106,11 +86,9 @@ retry@1.1.0
|
||||
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.5.2
|
||||
standard-minifier-js@2.4.0
|
||||
stylus@2.513.14
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
<body>
|
||||
<div id="notificationArea" class="notification-area"></div>
|
||||
</body>
|
||||
@ -1,2 +1,4 @@
|
||||
body
|
||||
background-color: black
|
||||
background-color: black
|
||||
height: 100%
|
||||
width: 100%
|
||||
|
||||
4
OHIFViewer/client/components/App.css
Normal file
4
OHIFViewer/client/components/App.css
Normal file
@ -0,0 +1,4 @@
|
||||
#root {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
import React, { Component } from 'react';
|
||||
import { withRouter } from 'react-router';
|
||||
import { Route, Switch } from 'react-router-dom';
|
||||
import SecretRoute from './SecretRoute.js';
|
||||
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 Studylist = OHIF.studylist.components.StudyList;
|
||||
@ -30,36 +30,34 @@ class App extends Component {
|
||||
|
||||
render() {
|
||||
return (
|
||||
<Provider store={window.store}>
|
||||
<Switch>
|
||||
<SecretRoute
|
||||
exact
|
||||
path="/studylist"
|
||||
component={Studylist}
|
||||
auth={this.props.auth}
|
||||
store={this.props.store}
|
||||
/>
|
||||
<SecretRoute
|
||||
exact
|
||||
path="/"
|
||||
component={Studylist}
|
||||
auth={this.props.auth}
|
||||
store={this.props.store}
|
||||
/>
|
||||
<SecretRoute
|
||||
exact
|
||||
path="/viewer"
|
||||
component={ConnectedViewer}
|
||||
auth={this.props.auth}
|
||||
store={this.props.store}
|
||||
/>
|
||||
{/*<Route path="/silent-refresh.html" onEnter={reload} />
|
||||
<Route path="/logout-redirect.html" onEnter={reload} />*/}
|
||||
<Route render={() =>
|
||||
<div> Sorry, this page does not exist. </div>}
|
||||
/>
|
||||
</Switch>
|
||||
</Provider>
|
||||
<Switch>
|
||||
<Route
|
||||
exact
|
||||
path="/studylist"
|
||||
component={Studylist}
|
||||
/*auth={this.props.auth}*/
|
||||
store={this.props.store}
|
||||
/>
|
||||
<Route
|
||||
exact
|
||||
path="/"
|
||||
component={Studylist}
|
||||
/*auth={this.props.auth}*/
|
||||
store={this.props.store}
|
||||
/>
|
||||
<Route
|
||||
exact
|
||||
path="/viewer"
|
||||
component={Viewer}
|
||||
/*auth={this.props.auth}*/
|
||||
store={this.props.store}
|
||||
/>
|
||||
{/*<Route path="/silent-refresh.html" onEnter={reload} />
|
||||
<Route path="/logout-redirect.html" onEnter={reload} />*/}
|
||||
<Route render={() =>
|
||||
<div> Sorry, this page does not exist. </div>}
|
||||
/>
|
||||
</Switch>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.viewerSection
|
||||
display: flex
|
||||
|
||||
23
OHIFViewer/client/components/index.js
Normal file
23
OHIFViewer/client/components/index.js
Normal 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')
|
||||
);
|
||||
});
|
||||
@ -1,18 +1,11 @@
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Session } from 'meteor/session';
|
||||
import { Router } from 'meteor/clinical:router';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
import { createStore } from 'redux';
|
||||
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(() => {
|
||||
const instance = Template.instance();
|
||||
instance.headerClasses = new ReactiveVar('');
|
||||
@ -50,7 +43,7 @@ Template.ohifViewer.onCreated(() => {
|
||||
|
||||
OHIF.header.dropdown.setItems(headerItems);
|
||||
|
||||
instance.autorun(() => {
|
||||
/*instance.autorun(() => {
|
||||
const currentRoute = Router.current();
|
||||
if (!currentRoute) return;
|
||||
const routeName = currentRoute.route.getName();
|
||||
@ -64,7 +57,7 @@ Template.ohifViewer.onCreated(() => {
|
||||
|
||||
// Set the viewer open state on session
|
||||
Session.set('ViewerOpened', isViewer);
|
||||
});
|
||||
});*/
|
||||
});
|
||||
|
||||
Template.ohifViewer.events({
|
||||
@ -72,14 +65,14 @@ Template.ohifViewer.events({
|
||||
event.preventDefault();
|
||||
const isViewer = Session.get('ViewerOpened');
|
||||
|
||||
if (isViewer) {
|
||||
/*if (isViewer) {
|
||||
Router.go('studylist');
|
||||
} else {
|
||||
const { studyInstanceUids } = OHIF.viewer.data;
|
||||
if (studyInstanceUids) {
|
||||
Router.go('viewerStudies', { studyInstanceUids });
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@import "{ohif:design}/app"
|
||||
@import "{ohif:viewerbase}/app"
|
||||
|
||||
body>.header
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import $ from 'jquery';
|
||||
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import 'meteor/ohif:viewerbase';
|
||||
@ -59,7 +59,7 @@ Template.toolbarSection.helpers({
|
||||
// bottomLabel: 'Hanging'
|
||||
// }]
|
||||
// };
|
||||
|
||||
|
||||
return {
|
||||
toggleable: true,
|
||||
key: 'rightSidebar',
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.toolbarSection
|
||||
theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
import React, { Component } from "react";
|
||||
import PropTypes from "prop-types";
|
||||
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { MeasurementTable } from 'meteor/ohif:measurement-table';
|
||||
|
||||
@ -6,11 +9,7 @@ import FlexboxLayout from '../flexboxLayout/flexboxLayout.js';
|
||||
|
||||
import 'meteor/ohif:cornerstone';
|
||||
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.
|
||||
@ -82,7 +81,6 @@ class Viewer extends Component {
|
||||
|
||||
// Define the OHIF.viewer.data global object
|
||||
OHIF.viewer.data = OHIF.viewer.data || {};
|
||||
debugger;
|
||||
|
||||
// @TypeSafeStudies
|
||||
// Clears OHIF.viewer.Studies collection
|
||||
@ -93,7 +91,7 @@ class Viewer extends Component {
|
||||
OHIF.viewer.StudyMetadataList.removeAll();
|
||||
|
||||
OHIF.viewer.data.studyInstanceUids = [];
|
||||
|
||||
|
||||
const studies = this.props.studies;
|
||||
studies.forEach(study => {
|
||||
const studyMetadata = new OHIF.metadata.StudyMetadata(study, study.studyInstanceUid);
|
||||
@ -137,7 +135,7 @@ class Viewer extends Component {
|
||||
}
|
||||
|
||||
Viewer.propTypes = {
|
||||
studies: PropTypes.array.isRequired
|
||||
studies: PropTypes.array
|
||||
};
|
||||
|
||||
export default Viewer;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@import "{ohif:design}/app"
|
||||
@import "{ohif:viewerbase}/app"
|
||||
|
||||
body
|
||||
background-color: black
|
||||
|
||||
@ -10,3 +10,6 @@
|
||||
<meta name="HandheldFriendly" content="True">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
</body>
|
||||
|
||||
@ -1,29 +1,12 @@
|
||||
import { Meteor } from "meteor/meteor";
|
||||
import { Router } from 'meteor/clinical:router';
|
||||
//import { Router } from 'meteor/clinical:router';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
Router.configure({
|
||||
/*Router.configure({
|
||||
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.route('/', function() {
|
||||
@ -66,4 +49,4 @@ Router.route('/IHEInvokeImageDisplay', function() {
|
||||
} else {
|
||||
Router.go('studylist', {}, {replaceState: true});
|
||||
}
|
||||
});
|
||||
});*/
|
||||
|
||||
4839
OHIFViewer/package-lock.json
generated
4839
OHIFViewer/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -5,16 +5,20 @@
|
||||
"main": "index.js",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.2.0",
|
||||
"bootstrap": "^4.1.3",
|
||||
"jquery": "3.3.1",
|
||||
"lodash.clonedeep": "^4.5.0",
|
||||
"lodash.debounce": "^4.0.8",
|
||||
"loglevel": "^1.6.1",
|
||||
"popper": "^1.0.1",
|
||||
"prop-types": "^15.6.2",
|
||||
"react": "^16.6.3",
|
||||
"react-dom": "^16.6.3",
|
||||
"react-redux": "^6.0.0",
|
||||
"react-router-dom": "^4.3.1",
|
||||
"react-viewerbase": "git://github.com:OHIF/react-viewerbase.git",
|
||||
"redux": "^4.0.1"
|
||||
"redux": "^4.0.1",
|
||||
"underscore": "1.9.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"husky": "^1.2.0",
|
||||
|
||||
@ -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');
|
||||
});
|
||||
@ -1,4 +0,0 @@
|
||||
import './lib';
|
||||
import './utils';
|
||||
|
||||
import './schema.js';
|
||||
@ -1,2 +0,0 @@
|
||||
import './object.js';
|
||||
import './DICOMWeb/';
|
||||
@ -1,5 +1,5 @@
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
export class CommandsManager {
|
||||
|
||||
@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { Session } from 'meteor/session';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { HotkeysContext } from 'meteor/ohif:hotkeys/client/classes/HotkeysContext';
|
||||
import { HotkeysContext } from './HotkeysContext';
|
||||
|
||||
export class HotkeysManager {
|
||||
constructor() {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { cornerstoneMath } from 'meteor/ohif:cornerstone';
|
||||
import { parsingUtils } from '../parsingUtils';
|
||||
import { parsingUtils } from '../lib/parsingUtils';
|
||||
|
||||
const FUNCTION = 'function';
|
||||
|
||||
11
Packages/ohif-core/client/classes/index.js
Normal file
11
Packages/ohif-core/client/classes/index.js
Normal 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
|
||||
};
|
||||
@ -2,13 +2,10 @@ import { Mongo } from 'meteor/mongo';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
// CurrentServer is a single document collection to describe which of the Servers is being used
|
||||
let collectionName = 'currentServer';
|
||||
if (Meteor.settings && Meteor.settings.public && Meteor.settings.public.clientOnly === true) {
|
||||
collectionName = null;
|
||||
}
|
||||
|
||||
const CurrentServer = new Mongo.Collection(collectionName);
|
||||
const CurrentServer = new Mongo.Collection(null);
|
||||
CurrentServer._debugName = 'CurrentServer';
|
||||
OHIF.servers = OHIF.servers || {};
|
||||
OHIF.servers.collections = OHIF.servers.collections || {};
|
||||
OHIF.servers.collections.currentServer = CurrentServer;
|
||||
|
||||
export { CurrentServer };
|
||||
@ -1,5 +1,5 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
// Create an object to store all the application mixins
|
||||
OHIF.mixins = {};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import $ from 'jquery';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
/*
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
/*
|
||||
* inputCheckbox: controls a checkbox input
|
||||
|
||||
@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Blaze } from 'meteor/blaze';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
/*
|
||||
|
||||
@ -2,8 +2,8 @@ import { OHIF } from 'meteor/ohif:core';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { Spacebars } from 'meteor/spacebars';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
|
||||
/*
|
||||
* form: controls a form and its registered inputs
|
||||
|
||||
@ -2,8 +2,8 @@ import { OHIF } from 'meteor/ohif:core';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
|
||||
/*
|
||||
* formItem: create a generic controller for form items
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
/*
|
||||
* group: controls a group and its registered items
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
|
||||
/*
|
||||
* groupRadio: controls all the radio inputs inside the group
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import $ from 'jquery';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
/*
|
||||
|
||||
@ -3,7 +3,7 @@ import { Blaze } from 'meteor/blaze';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
// Helper function to get the component's current schema
|
||||
const getCurrentSchemaDefs = (parentComponent, key) => {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
/*
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Blaze } from 'meteor/blaze';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
// Create a new custom template for the base component
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
Template.dialogForm.onCreated(() => {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@import "{ohif:design}/app"
|
||||
@import "{ohif:viewerbase}/app"
|
||||
|
||||
.modal .loading-text
|
||||
theme('color', '$textSecondaryColor')
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
Template.dialogProgress.onCreated(() => {
|
||||
const instance = Template.instance();
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
Template.dialogSimple.onCreated(() => {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { Blaze } from 'meteor/blaze';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
|
||||
const MARGIN_RIGHT = 15;
|
||||
const MARGIN_BOTTOM = 15;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.dropdown
|
||||
cursor: default
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.notification-area
|
||||
position: fixed
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import $ from 'jquery';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
Template.header.onCreated(() => {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@import "{ohif:design}/app"
|
||||
@import "{ohif:viewerbase}/app"
|
||||
|
||||
body>.header
|
||||
height: $topBarHeight
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { ReactiveVar } from 'meteor/reactive-var';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
Template.hotkeysForm.onCreated(() => {
|
||||
|
||||
@ -6,4 +6,3 @@ import './pages';
|
||||
import './paginationArea';
|
||||
import './playground';
|
||||
import './scrollArea';
|
||||
import './userLogin';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.page-error .error-stack
|
||||
display: table
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.page-message
|
||||
theme('color', '$textPrimaryColor')
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { SimpleSchema } from 'meteor/aldeed:simple-schema';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import $ from 'jquery';
|
||||
|
||||
Template.paginationArea.onCreated(function() {
|
||||
const instance = Template.instance();
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
.pagination-area
|
||||
font-size: 13px
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
Template.scrollArea.onCreated(() => {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@require '{ohif:design}/app'
|
||||
@require '{ohif:viewerbase}/app'
|
||||
|
||||
$scrollNavSize = 24px
|
||||
|
||||
|
||||
5
Packages/ohif-core/client/cornerstone.js
Normal file
5
Packages/ohif-core/client/cornerstone.js
Normal file
@ -0,0 +1,5 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { MetadataProvider } from './classes/MetadataProvider';
|
||||
|
||||
OHIF.cornerstone.MetadataProvider = MetadataProvider;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { Template } from 'meteor/templating';
|
||||
|
||||
/**
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { Template } from 'meteor/templating';
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { Template } from 'meteor/templating';
|
||||
|
||||
/**
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { Template } from 'meteor/templating';
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { Template } from 'meteor/templating';
|
||||
|
||||
/**
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { Template } from 'meteor/templating';
|
||||
|
||||
/**
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { HotkeysManager } from '/client/classes/HotkeysManager';
|
||||
import { HotkeysManager } from './classes/HotkeysManager';
|
||||
import 'jquery.hotkeys';
|
||||
|
||||
// Create hotkeys namespace using a HotkeysManager class instance
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import writeScript from './lib/writeScript';
|
||||
|
||||
// Check if browser is IE and add the polyfill scripts
|
||||
if (navigator && /MSIE \d|Trident.*rv:/.test(navigator.userAgent)) {
|
||||
Meteor.startup(() => {
|
||||
$(window).on('load', () => {
|
||||
window.onload = () => {
|
||||
// Fix SVG+USE issues by calling the SVG polyfill
|
||||
writeScript('svgxuse.min.js');
|
||||
});
|
||||
};
|
||||
});
|
||||
}
|
||||
@ -4,8 +4,9 @@ import './commands';
|
||||
import './hotkeys';
|
||||
import './components';
|
||||
import './ui';
|
||||
|
||||
import './routes.js';
|
||||
import './header.js';
|
||||
import './hotkeys.js';
|
||||
import './hotkeys.js';
|
||||
import './schema.js';
|
||||
import './utils/';
|
||||
import './startup.js';
|
||||
import './classes/';
|
||||
import './cornerstone.js';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
OHIF.cornerstone = {};
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
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
|
||||
@ -5,3 +5,6 @@ import './ui.js';
|
||||
import './utils.js';
|
||||
import './viewer.js';
|
||||
import './user.js';
|
||||
import './object.js';
|
||||
import './DICOMWeb/';
|
||||
import './getCurrentServer.js';
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
|
||||
OHIF.string = {};
|
||||
|
||||
|
||||
@ -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();
|
||||
});
|
||||
@ -1,4 +1,5 @@
|
||||
import { SimpleSchema } from 'meteor/aldeed:simple-schema';
|
||||
import { Match } from 'meteor/check';
|
||||
|
||||
/*
|
||||
Extend the available options on schema definitions:
|
||||
22
Packages/ohif-core/client/startup.js
Normal file
22
Packages/ohif-core/client/startup.js
Normal 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
|
||||
});
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { $ } from 'meteor/jquery';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
// Allow attaching to jQuery selectors
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Blaze } from 'meteor/blaze';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import _ from 'underscore';
|
||||
import $ from 'jquery';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
let zIndexBackdrop = 1060;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Blaze } from 'meteor/blaze';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
OHIF.ui.unsavedChangesDialog = function(callback, options) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { $ } from 'meteor/jquery';
|
||||
import $ from 'jquery';
|
||||
|
||||
// Temporarily show and hide the element to enable dimension calculations
|
||||
$.fn.tempShow = function(callback) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
class Dropdown {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { Template } from 'meteor/templating';
|
||||
import { Blaze } from 'meteor/blaze';
|
||||
import { $ } from 'meteor/jquery';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
const Notifications = {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
|
||||
// Allow attaching to jQuery selectors
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@import "{ohif:design}/app"
|
||||
@import "{ohif:viewerbase}/app"
|
||||
|
||||
.resizable
|
||||
transform(scale(1))
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Tracker } from 'meteor/tracker';
|
||||
import { OHIF } from 'meteor/ohif:core';
|
||||
import { _ } from 'meteor/underscore';
|
||||
import _ from 'underscore';
|
||||
|
||||
const FUNCTION = 'function';
|
||||
const STRING = 'string';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user