Merge pull request #1827 from OHIF/feat/ohif-127-196

OHIF-127-196-191: Hotkeys config and defaults
This commit is contained in:
Danny Brown authored and GitHub committed 2020-06-29 15:09:06 -04:00
commit 6db780842e
18 files changed
+260 -77

No files matched your search

+19 -1
View File
@@ -15,6 +15,7 @@ export default function ModeRoute({
dataSourceName,
extensionManager,
servicesManager,
hotkeysManager
}) {
// Parse route params/querystring
const query = useQuery();
@@ -26,7 +27,7 @@ export default function ModeRoute({
? StudyInstanceUIDs
: [StudyInstanceUIDs];
const { extensions, sopClassHandlers } = mode;
const { extensions, sopClassHandlers, hotkeys } = mode;
if (dataSourceName === undefined) {
dataSourceName = extensionManager.defaultDataSourceName;
@@ -74,6 +75,22 @@ export default function ModeRoute({
return ViewportGrid({ ...props, dataSource });
}
useEffect(() => {
if (!hotkeys) {
console.warn('[hotkeys] No bindings defined for hotkeys hook!');
return;
}
console.debug('[hotkeys] Setting up hotkeys...');
hotkeysManager.setDefaultHotKeys(hotkeys);
hotkeysManager.setHotkeys(hotkeys);
return () => {
console.debug('[hotkeys] Removing hotkeys...');
hotkeysManager.destroy();
};
}, []);
useEffect(() => {
route.init({ servicesManager, extensionManager });
}, [
@@ -83,6 +100,7 @@ export default function ModeRoute({
route,
servicesManager,
extensionManager,
hotkeysManager
]);
// 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,