Add hotkeys config for modes and defaults to core

This commit is contained in:
igoroctaviano committed 2020-06-29 11:53:46 -03:00
1 parent aa402183f4
commit db795f3cb0
13 files changed
+182 -23

No files matched your search

+5 -1
View File
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import { DicomMetadataStore } from '@ohif/core';
import { DragAndDropProvider, ImageViewerProvider } from '@ohif/ui';
//
import { useQuery } from '@hooks';
import { useQuery, useHotkeys } from '@hooks';
import ViewportGrid from '@components/ViewportGrid';
import Compose from './Compose';
@@ -15,7 +15,9 @@ export default function ModeRoute({
dataSourceName,
extensionManager,
servicesManager,
hotkeysManager
}) {
const isHotkeysLoaded = useHotkeys(hotkeysManager, mode.hotkeys);
// Parse route params/querystring
const query = useQuery();
const queryStudyInstanceUIDs = query.get('StudyInstanceUIDs');
@@ -83,6 +85,8 @@ export default function ModeRoute({
route,
servicesManager,
extensionManager,
hotkeysManager,
isHotkeysLoaded
]);
// This queries for series, but... What does it do with them?
@@ -22,12 +22,13 @@ import { ViewModelProvider } from '@ohif/core';
/:modeId/:modeRoute/?queryParameters=example
*/
export default function buildModeRoutes(
export default function buildModeRoutes({
modes,
dataSources,
extensionManager,
servicesManager
) {
servicesManager,
hotkeysManager
}) {
const routes = [];
// const dataSources = Object.keys(extensionManager.dataSourceMap).map(a =>
@@ -58,6 +59,7 @@ export default function buildModeRoutes(
dataSourceName={dataSourceName}
extensionManager={extensionManager}
servicesManager={servicesManager}
hotkeysManager={hotkeysManager}
/>
</ViewModelProvider>
);
@@ -83,6 +85,7 @@ export default function buildModeRoutes(
dataSourceName={defaultDataSourceName}
extensionManager={extensionManager}
servicesManager={servicesManager}
hotkeysManager={hotkeysManager}
/>
</ViewModelProvider>
);
+13 -7
View File
@@ -21,19 +21,25 @@ const bakedInRoutes = [
{ component: NotFound },
];
const createRoutes = (
const createRoutes = ({
modes,
dataSources,
extensionManager,
servicesManager
) => {
const routes =
buildModeRoutes(modes, dataSources, extensionManager, servicesManager) ||
[];
servicesManager,
hotkeysManager
}) => {
const routes = buildModeRoutes({
modes,
dataSources,
extensionManager,
servicesManager,
hotkeysManager
}) || [];
const allRoutes = [...routes, ...bakedInRoutes];
console.log(
'Creating Routes: ',
'Creating Routes:',
modes,
dataSources,
routes,