ToolBarService

platform/viewer/src/appInit.js

@@ -8,6 +8,7 @@ import {
   UIDialogService,
   MeasurementService,
   DisplaySetService,
+  ToolBarSerivce,
   // utils,
   // redux as reduxOHIF,
 } from '@ohif/core';
@@ -45,6 +46,7 @@ function appInit(appConfigOrFunc, defaultExtensions) {
     UIDialogService,
     MeasurementService,
     DisplaySetService,
+    ToolBarSerivce,
   ]);
 
   /**

platform/viewer/src/routes/Mode/DisplaySetCreator.jsx

@@ -1,55 +0,0 @@
-import { useEffect, useCallback } from 'react';
-import {
-  displaySetManager,
-  ToolBarManager,
-  useViewModel,
-  useToolbarLayout,
-} from '@ohif/core';
-
-export default function DisplaySetCreator({
-  location,
-  mode,
-  dataSourceName,
-  extensionManager,
-  DisplaySetService,
-}) {
-  console.warn('DisplaySetCreator rerendering');
-  const { routes, sopClassHandlers } = mode;
-  const dataSources = extensionManager.getDataSources(dataSourceName);
-  // TODO: For now assume one unique datasource.
-
-  const dataSource = dataSources[0];
-  const route = routes[0];
-
-  // Add toolbar state to the view model context?
-  const { displaySetInstanceUIDs, setDisplaySetInstanceUIDs } = useViewModel();
-
-  const { toolBarLayout, setToolBarLayout } = useToolbarLayout();
-
-  useEffect(() => {
-    let toolBarManager = new ToolBarManager(extensionManager, setToolBarLayout);
-    route.init({ toolBarManager });
-  }, [mode, dataSourceName, location]);
-
-  const createDisplaySets = useCallback(() => {
-    // Add SOPClassHandlers to a new SOPClassManager.
-    displaySetManager.init(extensionManager, sopClassHandlers, {
-      displaySetInstanceUIDs,
-      setDisplaySetInstanceUIDs,
-    });
-
-    const queryParams = location.search;
-
-    // Call the data source to start building the view model?
-    dataSource.retrieve.series.metadata(
-      queryParams,
-      displaySetManager.makeDisplaySets
-    );
-  }, [displaySetInstanceUIDs, location]);
-
-  useEffect(() => {
-    createDisplaySets();
-  }, [mode, dataSourceName, location]);
-
-  return null;
-}

platform/viewer/src/routes/Mode/Mode.jsx

@@ -1,12 +1,10 @@
 import React, { useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
 //
-import { ToolBarManager } from '@ohif/core';
 import { DragAndDropProvider } from '@ohif/ui';
 //
 import ViewportGrid from '@components/ViewportGrid';
 import Compose from './Compose';
-//import DisplaySetCreator from './DisplaySetCreator';
 
 export default function ModeRoute({
   location,
@@ -58,9 +56,7 @@ export default function ModeRoute({
   }
 
   useEffect(() => {
-    // TODO -> Make this into a service
-    let toolBarManager = new ToolBarManager(extensionManager); //, setToolBarLayout);
-    route.init({ toolBarManager });
+    route.init({ servicesManager, extensionManager });
   }, [mode, dataSourceName, location]);
 
   const createDisplaySets = useCallback(() => {