* init * more shifting * Move @babel dependencies up to workspace root * Begin updating dependent libraries to use sync'd webpack builds w/ watches * Commit changes before a long weekend * Split packages into platform and extensions * Consolidate how/where we specify file/module type entrypoints * Make it possible to pass in extensions as App props * Resolve viewer's modules * Target for UMD bundle * Add Webpack Stylus loader * Provide WebPack build options for microscopy, vtk, and ui * Better entrypoint for extensions * Push changes up to switch PCs * Fix ESM symlink build for Viewers * Shift docs to root * Specify additional lerna config props * Begin providing basic readme info * Rename example extension folder * Shift links to bottom of doc * First attempt at a netlify deploy preview * Attempt to fix deploy preview build * push workspace enabled to initial command; remove second yarn install; use npx to call gitbook cli commands * Try to use global gitbook-cli * Export node_modules path * More agressive with modifying PATH * Follow deploy log output advice * try again to set bin path * Try swapping bash with a new shell * Try bash -l instead of exec bash * Annd let's try again * and again * We may have figured it out johnny, boy * We need to pull cornerstone-wado-image-loader files from hoisted node_modules * Attempt to fix ticks/escapes * Change copy syntax; try running tests on viewers from root for circleci * Lower version to match circleci image * Try alternative jest-canvas-mock location and version file syntax * Run version command instead of calling node directly * Try alternative jest transform * Set path and enable workspaces * Add codecov flags * Use cpx so our copying finishes? * Get all platform unit tests to run * Run and report individually and in parallel * Try once relying on codecov yaml to split w/ flags * Add projects to split by flags * Generate separate reports * Trigger codecov after everything has finished running; these may not support flags * Use recommended flags from issue comments for codecov * Fix typo * Remove clear flag * Shift back to calling codecov from root * Generate example for codecov issue * Try fixing paths * Simplify * Try using codecov orb * Bump circleci version * Upload core and viewer * Use full string paths * Remove individual codecov calls * Fix dir * Combine files before upload * Escape anchors * tryfix syntax * Escape string literal * Combine lines to reduce path * long paths * Use home alias * Fix filename * Try to see the contents of our cat'd file * Also upload `core` * Try running with aliased folder * Fix path; split PR and Merge unit tests into separate jobs * Set default threshold * Fix typo * Changing to scoped package names * Adding note * Catch more updates * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.0 - @ohif/extension-dicom-html@0.0.4-alpha.0 - @ohif/extension-dicom-microscopy@0.0.9-alpha.0 - @ohif/extension-dicom-pdf@0.0.8-alpha.0 - @ohif/extension-vtk@0.1.4-alpha.0 - @ohif/core@0.11.1-alpha.0 - @ohif/i18n@0.2.3-alpha.0 - @ohif/ui@0.2.18-alpha.0 - @ohif/viewer@0.0.22-alpha.0 * Clean up primary readme * Support for dev and dev:* commands * Shift build command; satisfy default PWA build * Remove old scripts * Clean up UI to set webpack scripts * Tidy up project links * Clean duplicate code in UI project * Update UI project's docs * Clean up ui and i18n config * Reduce duplicate code in `@ohif/core` * Fix @ohif/ui versions * bump @ohif/core versions * Redux testkit dep * Remove unused/duplicate config files for projects/packages * ohif-core --> @ohif/core * Safer publish command * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.1 - @ohif/extension-dicom-html@0.0.4-alpha.1 - @ohif/extension-dicom-microscopy@0.0.9-alpha.1 - @ohif/extension-dicom-pdf@0.0.8-alpha.1 - @ohif/extension-vtk@0.1.4-alpha.1 - @ohif/core@0.11.1-alpha.1 - @ohif/i18n@0.2.3-alpha.1 - @ohif/ui@0.2.18-alpha.1 - @ohif/viewer@0.0.22-alpha.1 * test version bump * Add global prettier config * chore(release): publish %s [skip ci] - @ohif/viewer@0.0.22-alpha.2 * test lerna publish * Update package.jsons * Fix build scripts * catch changes * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.2 - @ohif/extension-dicom-html@0.0.4-alpha.2 - @ohif/extension-dicom-microscopy@0.0.9-alpha.2 - @ohif/extension-dicom-pdf@0.0.8-alpha.2 - @ohif/extension-vtk@0.1.4-alpha.2 - @ohif/core@0.11.1-alpha.2 - @ohif/i18n@0.2.3-alpha.2 - @ohif/ui@0.2.18-alpha.2 - @ohif/viewer@0.0.22-alpha.3 * fix eslint issues caused by eslint 6 and our react-app config * Publish with canary tag * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.3 - @ohif/extension-dicom-html@0.0.4-alpha.3 - @ohif/extension-dicom-microscopy@0.0.9-alpha.3 - @ohif/extension-dicom-pdf@0.0.8-alpha.3 - @ohif/extension-vtk@0.1.4-alpha.3 - @ohif/core@0.11.1-alpha.3 - @ohif/i18n@0.2.3-alpha.3 - @ohif/ui@0.2.18-alpha.3 - @ohif/viewer@0.0.22-alpha.4 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.4 - @ohif/extension-dicom-html@0.0.4-alpha.4 - @ohif/extension-dicom-microscopy@0.0.9-alpha.4 - @ohif/extension-dicom-pdf@0.0.8-alpha.4 - @ohif/extension-vtk@0.1.4-alpha.4 - @ohif/core@0.11.1-alpha.4 - @ohif/i18n@0.2.3-alpha.4 - @ohif/ui@0.2.18-alpha.4 - @ohif/viewer@0.0.22-alpha.5 * Simplify build * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.5 - @ohif/extension-dicom-html@0.0.4-alpha.5 - @ohif/extension-dicom-microscopy@0.0.9-alpha.5 - @ohif/extension-dicom-pdf@0.0.8-alpha.5 - @ohif/extension-vtk@0.1.4-alpha.5 - @ohif/core@0.11.1-alpha.5 - @ohif/i18n@0.2.3-alpha.5 - @ohif/ui@0.2.18-alpha.5 - @ohif/viewer@0.0.22-alpha.6 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.6 - @ohif/extension-dicom-html@0.0.4-alpha.6 - @ohif/extension-dicom-microscopy@0.0.9-alpha.6 - @ohif/extension-dicom-pdf@0.0.8-alpha.6 - @ohif/extension-vtk@0.1.4-alpha.6 - @ohif/core@0.11.1-alpha.6 - @ohif/i18n@0.2.3-alpha.6 - @ohif/ui@0.2.18-alpha.6 - @ohif/viewer@0.0.22-alpha.7 * Split version and publish * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.7 - @ohif/extension-dicom-html@0.0.4-alpha.7 - @ohif/extension-dicom-microscopy@0.0.9-alpha.7 - @ohif/extension-dicom-pdf@0.0.8-alpha.7 - @ohif/extension-vtk@0.1.4-alpha.7 - @ohif/core@0.11.1-alpha.7 - @ohif/i18n@0.2.3-alpha.7 - @ohif/ui@0.2.18-alpha.7 - @ohif/viewer@0.0.22-alpha.8 * Try simplify netlify build * react-viewerbase --> @ohif/ui * add test for stylus loader * Try new way to specify publish path * Use an output folder that won't be ignored * Try move command * fiddle with paths * Dig for some information * Make sure we're in root for our commands * Remove discovery * Setup script-tag example * Fix typo * Move config folder * Update cornerstone extension to use shared/root webpack configs * capture changes * Update extension webpack configs * Don't check in docz output * Fix babel runtime resolution issue * Simplify ui build steps * Push in progress * Shift directories * Get viewer dev path to work * Fix viewer commonjs build * Fix build pwa config for viewers * Make sure our package specific command can be called from root * Update notes * Fix imports and misc. merge notes * Bump wado-image-loader version * Switch up commands to remove webworkers copy * Fix CI config * Fix more broken package references * Add react-dropzone * Persist so e2e test can use * Fix lockfile * Use cypress orb to simplify CI * Fix config * Try again * Install yarn latest for orb * Install yarn a different way * Wait on correct port * Run tests in viewer project * Fix cypress config * Make Cypress happier - use default location * Simplify e2e testing * Capture UI changes since fork * Catch core up * Grab latest deps after merge * Fix broken import * Make sure cornerstone-wado-image-loader resolves to 3+ * Note regarding orbs * Fix refresh on 404 routes * Fix odd error for cornerstone-wado-image-loader * Different target for UMD * Simplify dev script * Try to get fancy with netlify output * Let's do it again * Try to fix measurementTools issue * See if we can get our lerna magic to work on merge to monorepo branch
243 lines
5.1 KiB
JavaScript
243 lines
5.1 KiB
JavaScript
import React, { Component } from 'react';
|
|
import * as dcmjs from 'dcmjs';
|
|
import TypedArrayProp from './TypedArrayProp';
|
|
import './DicomHtmlViewport.css';
|
|
|
|
function getRelationshipString(data) {
|
|
switch (data.RelationshipType) {
|
|
case 'HAS CONCEPT MOD':
|
|
return 'Concept modifier: ';
|
|
case 'HAS OBS CONTEXT':
|
|
return 'Observation context: ';
|
|
default:
|
|
return '';
|
|
}
|
|
}
|
|
|
|
const getMeaningString = data => {
|
|
if (data.ConceptNameCodeSequence) {
|
|
const { CodeMeaning } = data.ConceptNameCodeSequence;
|
|
|
|
return `${CodeMeaning} = `;
|
|
}
|
|
|
|
return '';
|
|
};
|
|
|
|
function getValueString(data) {
|
|
switch (data.ValueType) {
|
|
case 'CODE':
|
|
const {
|
|
CodeMeaning,
|
|
CodeValue,
|
|
CodingSchemeDesignator
|
|
} = data.ConceptNameCodeSequence;
|
|
|
|
return `${CodeMeaning} (${CodeValue}, ${CodingSchemeDesignator})`;
|
|
|
|
case 'PNAME':
|
|
return data.PersonName;
|
|
|
|
case 'TEXT':
|
|
return data.TextValue;
|
|
|
|
case 'UIDREF':
|
|
return data.UID;
|
|
|
|
case 'NUM':
|
|
const { MeasuredValueSequence } = data;
|
|
const numValue = MeasuredValueSequence.NumericValue;
|
|
const codeValue =
|
|
MeasuredValueSequence.MeasurementUnitsCodeSequence.CodeValue;
|
|
return `${numValue} ${codeValue}`;
|
|
}
|
|
}
|
|
|
|
function constructPlainValue(data) {
|
|
const value = getValueString(data);
|
|
|
|
if (value) {
|
|
return getRelationshipString(data) + getMeaningString(data) + value;
|
|
}
|
|
}
|
|
|
|
function constructContentSequence(data, header) {
|
|
if (!data.ContentSequence) {
|
|
return;
|
|
}
|
|
|
|
const items = data.ContentSequence.map(item => parseContent(item)).filter(
|
|
item => item
|
|
);
|
|
|
|
if (!items.length) {
|
|
return;
|
|
}
|
|
|
|
const result = {
|
|
items
|
|
};
|
|
|
|
if (header) {
|
|
result.header = header;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
function parseContent(data) {
|
|
if (data.ValueType) {
|
|
if (data.ValueType === 'CONTAINER') {
|
|
const header = data.ConceptNameCodeSequence.CodeMeaning;
|
|
|
|
return constructContentSequence(data, header);
|
|
}
|
|
|
|
return constructPlainValue(data);
|
|
}
|
|
|
|
if (data.ContentSequence) {
|
|
return constructContentSequence(data);
|
|
}
|
|
}
|
|
|
|
const { DicomMetaDictionary, DicomMessage } = dcmjs.data;
|
|
|
|
function getMainData(data) {
|
|
const root = [];
|
|
|
|
const patientValue = `${data.PatientName} (${data.PatientSex}, #${
|
|
data.PatientID
|
|
})`;
|
|
root.push(getMainDataItem('Patient', patientValue));
|
|
|
|
const studyValue = data.StudyDescription;
|
|
root.push(getMainDataItem('Study', studyValue));
|
|
|
|
const seriesValue = `${data.SeriesDescription} (#${data.SeriesNumber})`;
|
|
root.push(getMainDataItem('Series', seriesValue));
|
|
|
|
const manufacturerValue = `${data.Manufacturer} (${
|
|
data.ManufacturerModelName
|
|
}, #${data.DeviceSerialNumber})`;
|
|
|
|
root.push(getMainDataItem('Manufacturer', manufacturerValue));
|
|
|
|
const mainDataObjects = {
|
|
CompletionFlag: 'Completion flag',
|
|
VerificationFlag: 'Verification flag'
|
|
};
|
|
|
|
Object.keys(mainDataObjects).forEach(key => {
|
|
if (!data[key]) {
|
|
return;
|
|
}
|
|
|
|
const item = getMainDataItem(mainDataObjects[key], data[key]);
|
|
|
|
root.push(item);
|
|
});
|
|
|
|
// TODO: Format these dates
|
|
const contentDateTimeValue = `${data.ContentDate} ${data.ContentTime}`;
|
|
root.push(getMainDataItem('Content Date/Time', contentDateTimeValue));
|
|
|
|
root.push();
|
|
|
|
return <div>{root}</div>;
|
|
}
|
|
|
|
const getContentSequence = (data, level = 1) => {
|
|
let header;
|
|
|
|
if (data.ConceptNameCodeSequence) {
|
|
const {
|
|
CodeMeaning,
|
|
CodeValue,
|
|
CodingSchemeDesignator
|
|
} = data.ConceptNameCodeSequence;
|
|
|
|
header = `${CodeMeaning} (${CodeValue} - ${CodingSchemeDesignator})`;
|
|
}
|
|
|
|
const root = [];
|
|
if (header) {
|
|
const HeaderDynamicLevel = `h${level}`;
|
|
|
|
root.push(<HeaderDynamicLevel key={header}>{header}</HeaderDynamicLevel>);
|
|
}
|
|
|
|
Object.keys(data).forEach(key => {
|
|
const value = data[key];
|
|
|
|
let content;
|
|
if (value instanceof Object) {
|
|
content = getContentSequence(value, level + 1);
|
|
} else {
|
|
content = (
|
|
<div key={key}>
|
|
{key} - {data[key]}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
root.push(content);
|
|
});
|
|
|
|
return <div>{root}</div>;
|
|
};
|
|
|
|
function getMainDataItem(key, value) {
|
|
return (
|
|
<div key={key}>
|
|
<b>{key}</b>: {value}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
class DicomHtmlViewport extends Component {
|
|
state = {
|
|
content: null,
|
|
error: null
|
|
};
|
|
|
|
static propTypes = {
|
|
byteArray: TypedArrayProp.uint8
|
|
};
|
|
|
|
componentDidMount() {
|
|
const dataSet = this.setContentFromByteArray(this.props.byteArray);
|
|
}
|
|
|
|
setContentFromByteArray(byteArray) {
|
|
const arrayBuffer = byteArray.buffer;
|
|
const dicomData = DicomMessage.readFile(arrayBuffer);
|
|
const dataset = DicomMetaDictionary.naturalizeDataset(dicomData.dict);
|
|
dataset._meta = DicomMetaDictionary.namifyDataset(dicomData.meta);
|
|
|
|
const mainData = getMainData(dataset);
|
|
const contentSequence = getContentSequence(dataset);
|
|
const content = (
|
|
<>
|
|
{mainData}
|
|
{contentSequence}
|
|
</>
|
|
);
|
|
|
|
this.setState({
|
|
content
|
|
});
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<div className={'DicomHtmlViewport'}>
|
|
{this.state.content}
|
|
{this.state.error && <h2>{JSON.stringify(this.state.error)}</h2>}
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default DicomHtmlViewport;
|