Re-apply semicolons

This commit is contained in:
dannyrb committed 2019-05-30 00:46:45 -04:00
1 parent ffbd6ad6e4
commit c16654514d
7 files changed
+153 -151

No files matched your search

@@ -1,38 +1,38 @@
import { connect } from 'react-redux'
import PluginSwitch from './PluginSwitch.js'
import OHIF from 'ohif-core'
import { connect } from 'react-redux';
import PluginSwitch from './PluginSwitch.js';
import OHIF from 'ohif-core';
const { setLayout } = OHIF.redux.actions
const { setLayout } = OHIF.redux.actions;
const mapStateToProps = state => {
const { activeViewportIndex, layout } = state.viewports
const { activeViewportIndex, layout } = state.viewports;
return {
activeViewportIndex,
layout,
}
}
};
};
const mapDispatchToProps = dispatch => {
return {
setLayout: data => {
dispatch(setLayout(data))
dispatch(setLayout(data));
},
}
}
};
};
function setSingleLayoutData(originalArray, viewportIndex, data) {
const viewports = originalArray.slice()
const layoutData = Object.assign({}, viewports[viewportIndex], data)
const viewports = originalArray.slice();
const layoutData = Object.assign({}, viewports[viewportIndex], data);
viewports[viewportIndex] = layoutData
viewports[viewportIndex] = layoutData;
return viewports
return viewports;
}
const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
const { activeViewportIndex, layout } = propsFromState
const { setLayout } = propsFromDispatch
const { activeViewportIndex, layout } = propsFromState;
const { setLayout } = propsFromDispatch;
// TODO: Do not display certain options if the current display set
// cannot be displayed using these view types
@@ -43,15 +43,15 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'bars',
active: false,
onClick: () => {
console.warn('Original Acquisition')
console.warn('Original Acquisition');
const layoutData = setSingleLayoutData(
layout.viewports,
activeViewportIndex,
{ plugin: 'cornerstone' }
)
);
setLayout({ viewports: layoutData })
setLayout({ viewports: layoutData });
},
},
{
@@ -59,22 +59,22 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'cube',
active: false,
onClick: () => {
console.warn('Axial')
console.warn('Axial');
const data = {
plugin: 'vtk',
vtk: {
mode: 'mpr',
sliceNormal: [0, 0, 1],
},
}
};
const layoutData = setSingleLayoutData(
layout.viewports,
activeViewportIndex,
data
)
);
setLayout({ viewports: layoutData })
setLayout({ viewports: layoutData });
},
},
{
@@ -82,22 +82,22 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'cube',
active: false,
onClick: () => {
console.warn('Sagittal')
console.warn('Sagittal');
const data = {
plugin: 'vtk',
vtk: {
mode: 'mpr',
sliceNormal: [1, 0, 0],
},
}
};
const layoutData = setSingleLayoutData(
layout.viewports,
activeViewportIndex,
data
)
);
setLayout({ viewports: layoutData })
setLayout({ viewports: layoutData });
},
},
{
@@ -105,22 +105,22 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
icon: 'cube',
active: false,
onClick: () => {
console.warn('Coronal')
console.warn('Coronal');
const data = {
plugin: 'vtk',
vtk: {
mode: 'mpr',
sliceNormal: [0, 1, 0],
},
}
};
const layoutData = setSingleLayoutData(
layout.viewports,
activeViewportIndex,
data
)
);
setLayout({ viewports: layoutData })
setLayout({ viewports: layoutData });
},
},
/*{
@@ -140,17 +140,17 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
setLayout({ viewports: layoutData });
}
}*/
]
];
return {
buttons,
}
}
};
};
const ConnectedPluginSwitch = connect(
mapStateToProps,
mapDispatchToProps,
mergeProps
)(PluginSwitch)
)(PluginSwitch);
export default ConnectedPluginSwitch
export default ConnectedPluginSwitch;
+28 -26
View File
@@ -1,12 +1,12 @@
import './ToolbarRow.css'
import './ToolbarRow.css';
import React, { Component } from 'react'
import React, { Component } from 'react';
import ConnectedLayoutButton from './ConnectedLayoutButton'
import ConnectedPluginSwitch from './ConnectedPluginSwitch.js'
import OHIF from 'ohif-core'
import PropTypes from 'prop-types'
import { RoundedButtonGroup } from 'react-viewerbase'
import ConnectedLayoutButton from './ConnectedLayoutButton';
import ConnectedPluginSwitch from './ConnectedPluginSwitch.js';
import OHIF from 'ohif-core';
import PropTypes from 'prop-types';
import { RoundedButtonGroup } from 'react-viewerbase';
class ToolbarRow extends Component {
static propTypes = {
@@ -15,20 +15,20 @@ class ToolbarRow extends Component {
setLeftSidebarOpen: PropTypes.func,
setRightSidebarOpen: PropTypes.func,
pluginId: PropTypes.string,
}
};
static defaultProps = {
leftSidebarOpen: false,
rightSidebarOpen: false,
}
};
onLeftSidebarValueChanged = value => {
this.props.setLeftSidebarOpen(!!value)
}
this.props.setLeftSidebarOpen(!!value);
};
onRightSidebarValueChanged = value => {
this.props.setRightSidebarOpen(!!value)
}
this.props.setRightSidebarOpen(!!value);
};
render() {
const leftSidebarToggle = [
@@ -37,7 +37,7 @@ class ToolbarRow extends Component {
icon: 'th-large',
bottomLabel: 'Series',
},
]
];
const rightSidebarToggle = [
{
@@ -45,28 +45,30 @@ class ToolbarRow extends Component {
icon: 'list',
bottomLabel: 'Measurements',
},
]
];
const leftSidebarValue = this.props.leftSidebarOpen
? leftSidebarToggle[0].value
: null
: null;
const rightSidebarValue = this.props.rightSidebarOpen
? rightSidebarToggle[0].value
: null
: null;
const currentPluginId = this.props.pluginId
const currentPluginId = this.props.pluginId;
const { PLUGIN_TYPES, availablePlugins } = OHIF.plugins
const { PLUGIN_TYPES, availablePlugins } = OHIF.plugins;
const plugin = availablePlugins.find(entry => {
return entry.type === PLUGIN_TYPES.TOOLBAR && entry.id === currentPluginId
})
return (
entry.type === PLUGIN_TYPES.TOOLBAR && entry.id === currentPluginId
);
});
let pluginComp
let pluginComp;
if (plugin) {
const PluginComponent = plugin.component
const PluginComponent = plugin.component;
pluginComp = <PluginComponent />
pluginComp = <PluginComponent />;
}
return (
@@ -89,8 +91,8 @@ class ToolbarRow extends Component {
/>
</div>
</div>
)
);
}
}
export default ToolbarRow
export default ToolbarRow;