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

Re-add dicom microspy extension

Browse Source
This commit is contained in:
dannyrb 2019-06-17 15:42:11 -04:00
parent a1bbc4e87a
commit d1f7431af6
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/ohif-dicom-microscopy-extension/src/index.js
View File

@ -1,19 +1,16 @@
import DicomMicroscopySopClassHandler from './DicomMicroscopySopClassHandler.js'; import DicomMicroscopySopClassHandler from './DicomMicroscopySopClassHandler.js';
import DicomMicroscopyViewport from './DicomMicroscopyViewport.js'; import DicomMicroscopyViewport from './DicomMicroscopyViewport.js';
export default class OHIFDicomMicroscopyExtension { export default {
/** /**
* Extension ID is a unique id, might be used for namespacing extension specific redux actions/reducers (?) * Only required property. Should be a unique value across all extensions.
*/ */
getExtensionId() { id: 'microscopy',
return 'microscopy';
}
getViewportModule() { getViewportModule() {
return DicomMicroscopyViewport; return DicomMicroscopyViewport;
} },
getSopClassHandlerModule() { getSopClassHandlerModule() {
return DicomMicroscopySopClassHandler; return DicomMicroscopySopClassHandler;
} }
} };

3
extensions/ohif-vtk-extension/src/toolbarModule.js
View File

@ -12,7 +12,6 @@ const definitions = [
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE, type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
commandName: 'enableCrosshairsTool', commandName: 'enableCrosshairsTool',
commandOptions: {} commandOptions: {}
// window.commandsManager.runCommand('enableCrosshairsTool', {}, 'vtk');
}, },
{ {
id: 'WWWC', id: 'WWWC',
@ -22,7 +21,6 @@ const definitions = [
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE, type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
commandName: 'enableLevelTool', commandName: 'enableLevelTool',
commandOptions: {} commandOptions: {}
// window.commandsManager.runCommand('enableLevelTool', {}, 'vtk');
}, },
{ {
id: 'Rotate', id: 'Rotate',
@ -32,7 +30,6 @@ const definitions = [
type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE, type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
commandName: 'enableRotateTool', commandName: 'enableRotateTool',
commandOptions: {} commandOptions: {}
// window.commandsManager.runCommand('enableRotateTool', {}, 'vtk');
} }
]; ];

7
src/App.js
View File

@ -16,7 +16,7 @@ import { I18nextProvider } from 'react-i18next';
// 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/extension-dicom-pdf'; import OHIFDicomPDFExtension from '@ohif/extension-dicom-pdf';
import OHIFStandaloneViewer from './OHIFStandaloneViewer'; import OHIFStandaloneViewer from './OHIFStandaloneViewer';
import OHIFVTKExtension from '@ohif/extension-vtk'; import OHIFVTKExtension from '@ohif/extension-vtk';
@ -41,9 +41,6 @@ const commandsManager = new CommandsManager(commandsManagerConfig);
const hotkeysManager = new HotkeysManager(commandsManager); const hotkeysManager = new HotkeysManager(commandsManager);
const extensionManager = new ExtensionManager({ commandsManager }); const extensionManager = new ExtensionManager({ commandsManager });
// TODO: @dannyrb will fix this
window.commandsManager = commandsManager;
// TODO: Should be done in extensions w/ commandsModule // TODO: Should be done in extensions w/ commandsModule
// ~~ ADD COMMANDS // ~~ ADD COMMANDS
appCommands.init(commandsManager); appCommands.init(commandsManager);
@ -65,7 +62,7 @@ extensionManager.registerExtensions([
OHIFVTKExtension, OHIFVTKExtension,
OHIFDicomPDFExtension, OHIFDicomPDFExtension,
// new OHIFDicomHtmlExtension(), // new OHIFDicomHtmlExtension(),
// new OHIFDicomMicroscopyExtension(), OHIFDicomMicroscopyExtension,
]); ]);
// TODO[react] Use a provider when the whole tree is React // TODO[react] Use a provider when the whole tree is React

6
src/connectedComponents/ConnectedPluginSwitch.js
View File

@ -61,7 +61,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'cube', icon: 'cube',
active: false, active: false,
onClick: () => { onClick: () => {
window.commandsManager.runCommand('axial', {}, 'vtk'); commandsManager.runCommand('axial');
}, },
}, },
{ {
@ -69,7 +69,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'cube', icon: 'cube',
active: false, active: false,
onClick: () => { onClick: () => {
window.commandsManager.runCommand('sagittal', {}, 'vtk'); commandsManager.runCommand('sagittal');
}, },
}, },
{ {
@ -77,7 +77,7 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'cube', icon: 'cube',
active: false, active: false,
onClick: () => { onClick: () => {
window.commandsManager.runCommand('coronal', {}, 'vtk'); commandsManager.runCommand('coronal');
}, },
},*/ },*/
{ {