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

less error-prone import

Browse Source
This commit is contained in:
dannyrb 2019-05-14 22:12:34 -04:00
parent 25ae0bddc6
commit 557fdce016
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/ohif-cornerstone-extension/src/ConnectedCineDialog.js
View File

@ -1,9 +1,12 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { CineDialog } from 'react-viewerbase'; import { CineDialog } from 'react-viewerbase';
import OHIF from 'ohif-core'; import OHIF from 'ohif-core';
import { import as toolImport, getToolState } from 'cornerstone-tools'; import csTools from 'cornerstone-tools';
// Our target output kills the `as` and "import" throws a keyword error
// import { import as toolImport, getToolState } from 'cornerstone-tools';
import cloneDeep from 'lodash.clonedeep'; import cloneDeep from 'lodash.clonedeep';
const toolImport = csTools.import;
const scrollToIndex = toolImport('util/scrollToIndex'); const scrollToIndex = toolImport('util/scrollToIndex');
const { setViewportSpecificData } = OHIF.redux.actions; const { setViewportSpecificData } = OHIF.redux.actions;
@ -63,26 +66,26 @@ const mergeProps = (propsFromState, propsFromDispatch, ownProps) => {
}); });
}, },
onClickNextButton: () => { onClickNextButton: () => {
const stackData = getToolState(activeEnabledElement, 'stack'); const stackData = csTools.getToolState(activeEnabledElement, 'stack');
if (!stackData || !stackData.data || !stackData.data.length) return; if (!stackData || !stackData.data || !stackData.data.length) return;
const { currentImageIdIndex, imageIds } = stackData.data[0]; const { currentImageIdIndex, imageIds } = stackData.data[0];
if (currentImageIdIndex >= imageIds.length - 1) return; if (currentImageIdIndex >= imageIds.length - 1) return;
scrollToIndex(activeEnabledElement, currentImageIdIndex + 1); scrollToIndex(activeEnabledElement, currentImageIdIndex + 1);
}, },
onClickBackButton: () => { onClickBackButton: () => {
const stackData = getToolState(activeEnabledElement, 'stack'); const stackData = csTools.getToolState(activeEnabledElement, 'stack');
if (!stackData || !stackData.data || !stackData.data.length) return; if (!stackData || !stackData.data || !stackData.data.length) return;
const { currentImageIdIndex } = stackData.data[0]; const { currentImageIdIndex } = stackData.data[0];
if (currentImageIdIndex === 0) return; if (currentImageIdIndex === 0) return;
scrollToIndex(activeEnabledElement, currentImageIdIndex - 1); scrollToIndex(activeEnabledElement, currentImageIdIndex - 1);
}, },
onClickSkipToStart: () => { onClickSkipToStart: () => {
const stackData = getToolState(activeEnabledElement, 'stack'); const stackData = csTools.getToolState(activeEnabledElement, 'stack');
if (!stackData || !stackData.data || !stackData.data.length) return; if (!stackData || !stackData.data || !stackData.data.length) return;
scrollToIndex(activeEnabledElement, 0); scrollToIndex(activeEnabledElement, 0);
}, },
onClickSkipToEnd: () => { onClickSkipToEnd: () => {
const stackData = getToolState(activeEnabledElement, 'stack'); const stackData = csTools.getToolState(activeEnabledElement, 'stack');
if (!stackData || !stackData.data || !stackData.data.length) return; if (!stackData || !stackData.data || !stackData.data.length) return;
const lastIndex = stackData.data[0].imageIds.length - 1; const lastIndex = stackData.data[0].imageIds.length - 1;
scrollToIndex(activeEnabledElement, lastIndex); scrollToIndex(activeEnabledElement, lastIndex);