From f09ebbe2e86256b4dd7968f960b7e2cf569f01bb Mon Sep 17 00:00:00 2001 From: Khalid Williams <36432040+khalidwilliams@users.noreply.github.com> Date: Tue, 28 Apr 2020 04:49:57 -0600 Subject: [PATCH] chore: cleanup dcmjs imports * Update imports in /platform * Update dcmjs imports in /extentions --- extensions/dicom-html/src/DicomHtmlViewport.js | 2 +- extensions/dicom-rt/src/loadRTStruct.js | 2 +- extensions/dicom-segmentation/src/loadSegmentation.js | 2 +- platform/core/src/DICOMSR/handleStructuredReport.js | 2 +- platform/core/src/DICOMSR/parseDicomStructuredReport.js | 2 +- platform/core/src/DICOMSR/parseMeasurementsData.js | 2 +- platform/core/src/DICOMSR/utils/isToolSupported.js | 2 +- platform/core/src/classes/MetadataProvider.js | 2 +- platform/viewer/src/lib/localFileLoaders/dicomFileLoader.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/dicom-html/src/DicomHtmlViewport.js b/extensions/dicom-html/src/DicomHtmlViewport.js index 7dca015d8..a07642c00 100644 --- a/extensions/dicom-html/src/DicomHtmlViewport.js +++ b/extensions/dicom-html/src/DicomHtmlViewport.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import TypedArrayProp from './TypedArrayProp'; import './DicomHtmlViewport.css'; diff --git a/extensions/dicom-rt/src/loadRTStruct.js b/extensions/dicom-rt/src/loadRTStruct.js index e72b13a87..659f2087a 100644 --- a/extensions/dicom-rt/src/loadRTStruct.js +++ b/extensions/dicom-rt/src/loadRTStruct.js @@ -1,5 +1,5 @@ import OHIF from '@ohif/core'; -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import cornerstone from 'cornerstone-core'; import cornerstoneTools from 'cornerstone-tools'; import transformPointsToImagePlane from './utils/transformPointsToImagePlane'; diff --git a/extensions/dicom-segmentation/src/loadSegmentation.js b/extensions/dicom-segmentation/src/loadSegmentation.js index 6b449baf0..1244b52c9 100644 --- a/extensions/dicom-segmentation/src/loadSegmentation.js +++ b/extensions/dicom-segmentation/src/loadSegmentation.js @@ -1,5 +1,5 @@ import OHIF from '@ohif/core'; -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import cornerstone from 'cornerstone-core'; import cornerstoneTools from 'cornerstone-tools'; diff --git a/platform/core/src/DICOMSR/handleStructuredReport.js b/platform/core/src/DICOMSR/handleStructuredReport.js index 20b56ce79..fcaa19890 100644 --- a/platform/core/src/DICOMSR/handleStructuredReport.js +++ b/platform/core/src/DICOMSR/handleStructuredReport.js @@ -1,4 +1,4 @@ -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import { api } from 'dicomweb-client'; import DICOMWeb from '../DICOMWeb'; diff --git a/platform/core/src/DICOMSR/parseDicomStructuredReport.js b/platform/core/src/DICOMSR/parseDicomStructuredReport.js index d1801dec3..df5770364 100644 --- a/platform/core/src/DICOMSR/parseDicomStructuredReport.js +++ b/platform/core/src/DICOMSR/parseDicomStructuredReport.js @@ -1,4 +1,4 @@ -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import findInstanceMetadataBySopInstanceUID from './utils/findInstanceMetadataBySopInstanceUid'; diff --git a/platform/core/src/DICOMSR/parseMeasurementsData.js b/platform/core/src/DICOMSR/parseMeasurementsData.js index 50b8a5b1d..359b1e27e 100644 --- a/platform/core/src/DICOMSR/parseMeasurementsData.js +++ b/platform/core/src/DICOMSR/parseMeasurementsData.js @@ -1,4 +1,4 @@ -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import cornerstone from 'cornerstone-core'; import log from '../log'; diff --git a/platform/core/src/DICOMSR/utils/isToolSupported.js b/platform/core/src/DICOMSR/utils/isToolSupported.js index 5fc611115..ad9dc6516 100644 --- a/platform/core/src/DICOMSR/utils/isToolSupported.js +++ b/platform/core/src/DICOMSR/utils/isToolSupported.js @@ -1,4 +1,4 @@ -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; /** * Checks if dcmjs has support to determined tool diff --git a/platform/core/src/classes/MetadataProvider.js b/platform/core/src/classes/MetadataProvider.js index ff360a3e3..d633c321f 100644 --- a/platform/core/src/classes/MetadataProvider.js +++ b/platform/core/src/classes/MetadataProvider.js @@ -1,4 +1,4 @@ -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import queryString from 'query-string'; import dicomParser from 'dicom-parser'; import getPixelSpacingInformation from '../utils/metadataProvider/getPixelSpacingInformation'; diff --git a/platform/viewer/src/lib/localFileLoaders/dicomFileLoader.js b/platform/viewer/src/lib/localFileLoaders/dicomFileLoader.js index 71da0cbc8..d485ca55e 100644 --- a/platform/viewer/src/lib/localFileLoaders/dicomFileLoader.js +++ b/platform/viewer/src/lib/localFileLoaders/dicomFileLoader.js @@ -1,4 +1,4 @@ -import * as dcmjs from 'dcmjs'; +import dcmjs from 'dcmjs'; import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'; import FileLoader from './fileLoader'; import OHIF from '@ohif/core';