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

Nuke "SecondaryToolbar" which is really just a Toolbar variant

Browse Source
This commit is contained in:
dannyrb 2020-05-14 22:54:33 -04:00 committed by James A. Petts
parent ded1431fab
commit 00347d3ecb
2 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
extensions/default/src/ViewerLayout/SecondaryToolbar.jsx
View File

@ -1,52 +0,0 @@
import React from 'react';
import PropTypes from 'prop-types';
//
import { Toolbar } from '@ohif/ui';
function SecondaryToolbar({ tools }) {
// const tools = [
// {
// id: 'Annotate',
// label: 'Annotate',
// icon: 'tool-annotate',
// type: null,
// commandName: 'setToolActive',
// commandOptions: { toolName: 'Annotate' },
// onClick: () => console.log('Activate Annotate'),
// },
// {
// id: 'Bidirectional',
// label: 'Bidirectional',
// icon: 'tool-bidirectional',
// type: null,
// commandName: 'setToolActive',
// commandOptions: { toolName: 'Bidirectional' },
// onClick: () => console.log('Activate Bidirectional'),
// },
// {
// id: 'Elipse',
// label: 'Elipse',
// icon: 'tool-elipse',
// type: null,
// commandName: 'setToolActive',
// commandOptions: { toolName: 'Elipse' },
// onClick: () => console.log('Activate Elipse'),
// },
// {
// id: 'Length',
// label: 'Length',
// icon: 'tool-length',
// type: null,
// commandName: 'setToolActive',
// commandOptions: { toolName: 'Length' },
// onClick: () => console.log('Activate Length'),
// },
// ];
return <Toolbar type="secondary" tools={tools} />;
}
SecondaryToolbar.propTypes = {
tools: PropTypes.array.isRequired,
};
export default SecondaryToolbar;

7
extensions/default/src/ViewerLayout/index.jsx
View File

@ -1,9 +1,8 @@
import React from 'react'; import React, { useEffect } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { SidePanel } from '@ohif/ui'; import { SidePanel, Toolbar } from '@ohif/ui';
// //
import Header from './Header.jsx'; import Header from './Header.jsx';
import SecondaryToolbar from './SecondaryToolbar.jsx';
function ViewerLayout({ function ViewerLayout({
// From Extension Module Params // From Extension Module Params
@ -68,7 +67,7 @@ function ViewerLayout({
/> />
<div className="flex flex-col flex-1 h-full pb-2"> <div className="flex flex-col flex-1 h-full pb-2">
<div className="flex flex-2 w-100 border-b border-transparent h-12"> <div className="flex flex-2 w-100 border-b border-transparent h-12">
<SecondaryToolbar tools={secondaryToolBarLayout.tools} /> <Toolbar type="secondary" tools={secondaryToolBarLayout.tools} />
</div> </div>
<div className="flex flex-1 h-full overflow-hidden bg-black items-center justify-center"> <div className="flex flex-1 h-full overflow-hidden bg-black items-center justify-center">
<ViewportGrid /> <ViewportGrid />