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

Shift to new syntax; try to get only cornerstone extension working with new syntax

Browse Source
This commit is contained in:
dannyrb 2019-06-13 09:50:53 -04:00
parent 0318203770
commit 31c987d700
4 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ohif-cornerstone-extension/src/OHIFCornerstoneExtension.js
View File

@ -1,5 +1,5 @@
import React, { Component } from 'react';
import OHIFCornerstoneViewport from './OHIFCornerstoneViewport.js'; import OHIFCornerstoneViewport from './OHIFCornerstoneViewport.js';
import React from 'react';
import ToolbarModule from './ToolbarModule.js'; import ToolbarModule from './ToolbarModule.js';
/** /**

12
extensions/ohif-cornerstone-extension/src/OHIFCornerstoneViewport.js
View File

@ -1,9 +1,11 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import OHIF from 'ohif-core';
import ConnectedCornerstoneViewport from './ConnectedCornerstoneViewport';
import cornerstone from 'cornerstone-core';
import './config'; import './config';
import React, { Component } from 'react';
import ConnectedCornerstoneViewport from './ConnectedCornerstoneViewport';
import OHIF from 'ohif-core';
import PropTypes from 'prop-types';
import cornerstone from 'cornerstone-core';
import handleSegmentationStorage from './handleSegmentationStorage.js'; import handleSegmentationStorage from './handleSegmentationStorage.js';
const { StackManager } = OHIF.utils; const { StackManager } = OHIF.utils;

24
extensions/ohif-cornerstone-extension/src/index.js
View File

@ -1,3 +1,23 @@
import OHIFCornerstoneExtension from './OHIFCornerstoneExtension.js'; import OHIFCornerstoneViewport from './OHIFCornerstoneViewport.js';
import ToolbarModule from './ToolbarModule.js';
import commandsModule from './commandsModule.js';
export default OHIFCornerstoneExtension; /**
*
*/
export default {
/**
* Only required property. Should be a unique value across all extensions.
*/
id: 'cornerstone',
getViewportModule() {
return OHIFCornerstoneViewport;
},
getToolbarModule() {
return ToolbarModule;
},
getCommandsModule() {
return commandsModule;
}
};

29
src/App.js
View File

@ -14,13 +14,13 @@ import {
initWebWorkers, initWebWorkers,
} from './utils/index.js'; } from './utils/index.js';
import ConnectedToolContextMenu from './connectedComponents/ConnectedToolContextMenu'; // import ConnectedToolContextMenu from './connectedComponents/ConnectedToolContextMenu';
import OHIFCornerstoneExtension from '@ohif/extension-cornerstone'; import OHIFCornerstoneExtension from '@ohif/extension-cornerstone';
import OHIFDicomHtmlExtension from 'ohif-dicom-html-extension'; // import OHIFDicomHtmlExtension from 'ohif-dicom-html-extension';
import OHIFDicomMicroscopyExtension from '@ohif/extension-dicom-microscopy'; // import OHIFDicomMicroscopyExtension from '@ohif/extension-dicom-microscopy';
import OHIFDicomPDFExtension from 'ohif-dicom-pdf-extension'; // import OHIFDicomPDFExtension from 'ohif-dicom-pdf-extension';
import OHIFStandaloneViewer from './OHIFStandaloneViewer'; import OHIFStandaloneViewer from './OHIFStandaloneViewer';
import OHIFVTKExtension from '@ohif/extension-vtk'; // import OHIFVTKExtension from '@ohif/extension-vtk';
import { OidcProvider } from 'redux-oidc'; import { OidcProvider } from 'redux-oidc';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
@ -36,9 +36,9 @@ const commandsManagerConfig = {
getActiveContexts: () => store.getState().ui.activeContexts, getActiveContexts: () => store.getState().ui.activeContexts,
}; };
const extensionManager = new ExtensionManager();
const commandsManager = new CommandsManager(commandsManagerConfig); const commandsManager = new CommandsManager(commandsManagerConfig);
const hotkeysManager = new HotkeysManager(commandsManager); const hotkeysManager = new HotkeysManager(commandsManager);
const extensionManager = new ExtensionManager({ commandsManager });
// TODO: Should be done in extensions w/ commandsModule // TODO: Should be done in extensions w/ commandsModule
// ~~ ADD COMMANDS // ~~ ADD COMMANDS
@ -61,17 +61,18 @@ store.dispatch({
setupTools(store); setupTools(store);
const children = { // const children = {
viewport: [<ConnectedToolContextMenu key="tool-context" />], // viewport: [<ConnectedToolContextMenu key="tool-context" />],
}; // };
/** TODO: extensions should be passed in as prop as soon as we have the extensions as separate packages and then registered by ExtensionsManager */ /** TODO: extensions should be passed in as prop as soon as we have the extensions as separate packages and then registered by ExtensionsManager */
extensionManager.registerExtensions([ extensionManager.registerExtensions([
new OHIFCornerstoneExtension({ children }), OHIFCornerstoneExtension,
new OHIFVTKExtension(), // new OHIFCornerstoneExtension({ children }),
new OHIFDicomPDFExtension(), // new OHIFVTKExtension(),
new OHIFDicomHtmlExtension(), // new OHIFDicomPDFExtension(),
new OHIFDicomMicroscopyExtension(), // new OHIFDicomHtmlExtension(),
// new OHIFDicomMicroscopyExtension(),
]); ]);
// TODO[react] Use a provider when the whole tree is React // TODO[react] Use a provider when the whole tree is React