Instance metadata/metadata providers overhaul (#1481)

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Instance metadata plus metadata provider overhaul.

Fix consumption of wado-uri urls

fallbacks + datatype agnosticism.

WIP DICOMify things.

fix various issues with naturalized variable naming migration.

Remove metadata provider.

Fix consumption of multiframe images and addition of CWIL metadata.

Fix strange build issues.

Fix CWIL style windowWidth to array from naturalized DICOM.

Fix PT, CT, CR and DX issues for cornerstone + DX issues for vtkjs.

Move color palette fetching down to the natuaralized JSON level.

Remove unused StudyMetadataSummary

Remove redundant dicom metadata dictionary.

Working local + json routes.

Fix SR read.

Finished first round of testing + cleaned up debugging etc.

* data => metadata for instance naturalizedJSON

* Update dcmjs version

* Correct github isssues.

* Fix erroneously replaced files.

* Danny's recommended changes.

* Update JSON CI

* Update casing of import.

* Fix jump for SR.

* Fix unit tests for measurements service

* Fix json CI test.

* fix: update yarn lock

* Fix local non-encapsulated pdf view

* CI updated to new sucess message.

Co-authored-by: Danny <danny.ri.brown@gmail.com>
This commit is contained in:
James PettsandDanny authored and GitHub committed 2020-03-09 19:03:23 +00:00
1 parent 8833731ad3
commit 1d85f7a74e
142 files changed
+5322 -8570

No files matched your search

@@ -12,10 +12,10 @@ export class QuickSwitch extends Component {
side: PropTypes.string,
studyListData: PropTypes.array.isRequired,
onSeriesSelected: PropTypes.func.isRequired,
seriesListData: PropTypes.array,
seriesData: PropTypes.array,
onStudySelected: PropTypes.func,
activeStudyInstanceUid: PropTypes.string,
activeDisplaySetInstanceUid: PropTypes.string,
activeStudyInstanceUID: PropTypes.string,
activeDisplaySetInstanceUID: PropTypes.string,
};
constructor(props) {
@@ -24,26 +24,26 @@ export class QuickSwitch extends Component {
this.state = {
seriesQuickSwitchOpen: false,
sideClass: this.props.side || '',
activeStudyInstanceUid: this.props.activeStudyInstanceUid,
activeDisplaySetInstanceUid: this.props.activeDisplaySetInstanceUid,
activeStudyInstanceUID: this.props.activeStudyInstanceUID,
activeDisplaySetInstanceUID: this.props.activeDisplaySetInstanceUID,
};
}
componentDidUpdate(prevProps) {
const props = this.props;
if (props.activeStudyInstanceUid !== prevProps.activeStudyInstanceUid) {
if (props.activeStudyInstanceUID !== prevProps.activeStudyInstanceUID) {
this.setState({
activeStudyInstanceUid: props.activeStudyInstanceUid,
activeStudyInstanceUID: props.activeStudyInstanceUID,
});
}
if (
props.activeDisplaySetInstanceUid !==
prevProps.activeDisplaySetInstanceUid
props.activeDisplaySetInstanceUID !==
prevProps.activeDisplaySetInstanceUID
) {
this.setState({
activeDisplaySetInstanceUid: props.activeDisplaySetInstanceUid,
activeDisplaySetInstanceUID: props.activeDisplaySetInstanceUID,
});
}
}
@@ -55,9 +55,7 @@ export class QuickSwitch extends Component {
return (
<div
className={`series-quick-switch clearfix noselect ${
this.state.sideClass
} ${quickSwitchClass}`}
className={`series-quick-switch clearfix noselect ${this.state.sideClass} ${quickSwitchClass}`}
onMouseLeave={this.hideSeriesSwitch}
>
<div className="series-switch" onMouseEnter={this.showSeriesSwitch}>
@@ -68,8 +66,8 @@ export class QuickSwitch extends Component {
<SeriesList
seriesItems={this.getSeriesItems()}
onClick={this.onSeriesClick}
activeDisplaySetInstanceUid={
this.state.activeDisplaySetInstanceUid
activeDisplaySetInstanceUID={
this.state.activeDisplaySetInstanceUID
}
/>
</ScrollableArea>
@@ -82,7 +80,7 @@ export class QuickSwitch extends Component {
<StudiesList
studyListData={this.props.studyListData}
onClick={this.onStudyClick}
activeStudyInstanceUid={this.state.activeStudyInstanceUid}
activeStudyInstanceUID={this.state.activeStudyInstanceUID}
/>
</ScrollableArea>
</div>
@@ -92,29 +90,29 @@ export class QuickSwitch extends Component {
}
getSeriesItems = () => {
let seriesListData;
let seriesData;
if (this.props.seriesListData) {
seriesListData = this.props.seriesListData;
} else if (this.state.activeStudyInstanceUid) {
if (this.props.seriesData) {
seriesData = this.props.seriesData;
} else if (this.state.activeStudyInstanceUID) {
const study = this.props.studyListData.find(
study => study.studyInstanceUid === this.state.activeStudyInstanceUid
study => study.StudyInstanceUID === this.state.activeStudyInstanceUID
);
seriesListData = study.thumbnails;
seriesData = study.thumbnails;
} else {
seriesListData = this.props.studyListData[0].thumbnails;
seriesData = this.props.studyListData[0].thumbnails;
}
return seriesListData || [];
return seriesData || [];
};
getSmallListItems = () => {
const seriesItems = this.getSeriesItems() || [];
return seriesItems.map((seriesData, index) => {
const active =
seriesData.displaySetInstanceUid ===
this.state.activeDisplaySetInstanceUid;
seriesData.displaySetInstanceUID ===
this.state.activeDisplaySetInstanceUID;
return (
<div key={index} className={`series-item ${active ? 'active' : ''}`} />
);
@@ -126,14 +124,14 @@ export class QuickSwitch extends Component {
this.props.onStudySelected(studyDataSelected);
}
this.setState({
activeStudyInstanceUid: studyDataSelected.studyInstanceUid,
activeStudyInstanceUID: studyDataSelected.StudyInstanceUID,
seriesQuickSwitchOpen: true,
});
};
onSeriesClick = seriesDataSelected => {
this.setState({
activeDisplaySetInstanceUid: seriesDataSelected.displaySetInstanceUid,
activeDisplaySetInstanceUID: seriesDataSelected.displaySetInstanceUID,
});
this.props.onSeriesSelected(seriesDataSelected);
@@ -8,7 +8,7 @@ export class SeriesList extends Component {
static propTypes = {
seriesItems: PropTypes.array.isRequired,
onClick: PropTypes.func.isRequired,
activeDisplaySetInstanceUid: PropTypes.string,
activeDisplaySetInstanceUID: PropTypes.string,
};
render() {
@@ -25,12 +25,12 @@ export class SeriesList extends Component {
return this.props.seriesItems.map((seriesData, index) => {
return (
<Thumbnail
key={seriesData.displaySetInstanceUid}
key={seriesData.displaySetInstanceUID}
id={`series_thumb_${index}`}
{...seriesData}
active={
seriesData.displaySetInstanceUid ===
this.props.activeDisplaySetInstanceUid
seriesData.displaySetInstanceUID ===
this.props.activeDisplaySetInstanceUID
}
onClick={() => this.props.onClick(seriesData)}
/>
@@ -12,13 +12,13 @@ export class StudiesItem extends Component {
render() {
const {
studyDate,
studyDescription,
StudyDate,
StudyDescription,
modalities,
studyAvailable,
} = this.props.studyData;
const activeClass = this.props.active ? ' active' : '';
const hasDescriptionAndDate = studyDate && studyDescription;
const hasDescriptionAndDate = StudyDate && StudyDescription;
return (
<div
className={`studyBrowseItem${activeClass}`}
@@ -36,8 +36,8 @@ export class StudiesItem extends Component {
<div className="studyText">
{hasDescriptionAndDate ? (
<React.Fragment>
<div className="studyDate">{studyDate}</div>
<div className="studyDescription">{studyDescription}</div>
<div className="studyDate">{StudyDate}</div>
<div className="studyDescription">{StudyDescription}</div>
</React.Fragment>
) : (
<div className="studyAvailability">
@@ -8,7 +8,7 @@ $nestingMargin = 6px
$spacerX = 7px
$spacerY = 12px
.studyBrowseItem
.studyBrowseItem
margin-bottom: 10px;
position: relative
// required transformation to make inner fixed elements relative to this one
@@ -58,7 +58,7 @@ $spacerY = 12px
&.additional
color: var(--text-secondary-color)
.studyModality
color: var(--primary-background-color)
&
@@ -9,7 +9,7 @@ export class StudiesList extends Component {
class: PropTypes.string,
studyListData: PropTypes.array.isRequired,
onClick: PropTypes.func.isRequired,
activeStudyInstanceUid: PropTypes.string,
activeStudyInstanceUID: PropTypes.string,
};
render() {
@@ -27,7 +27,7 @@ export class StudiesList extends Component {
key={index}
studyData={studyData}
active={
studyData.studyInstanceUid === this.props.activeStudyInstanceUid
studyData.StudyInstanceUID === this.props.activeStudyInstanceUID
}
onClick={event => this.props.onClick(studyData)}
/>
@@ -23,17 +23,17 @@ import studies from './studies.js'
studyListData={state.studyListData}
// If this is always activeStudy's thumbnails,
// Why do we need to specify this?
seriesListData={
seriesData={
state.studyListData.find((study) => {
return !!study.active;
}).thumbnails}
onSeriesSelected={(selectedSeries) => {
const { studyListData } = state;
const selectedId = selectedSeries.displaySetInstanceUid;
const selectedId = selectedSeries.displaySetInstanceUID;
studyListData.forEach(study => {
study.thumbnails.forEach(series => {
series.active = series.displaySetInstanceUid === selectedId;
series.active = series.displaySetInstanceUID === selectedId;
})
});
@@ -41,10 +41,10 @@ import studies from './studies.js'
}}
onStudySelected={(selectedStudy) => {
const { studyListData } = state;
const selectedId = selectedStudy.studyInstanceUid;
const selectedId = selectedStudy.StudyInstanceUID;
studyListData.forEach(study => {
study.active = study.studyInstanceUid === selectedId;
study.active = study.StudyInstanceUID === selectedId;
});
setState({ studyListData });
@@ -1,74 +1,74 @@
export default [
{
studyInstanceUid: '10001',
studyDescription: 'Anti-PD-1',
StudyInstanceUID: '10001',
StudyDescription: 'Anti-PD-1',
modalities: 'CT',
studyDate: '18-nov-2018',
StudyDate: '18-nov-2018',
active: false,
thumbnails: [
{
imageSrc:
'https://raw.githubusercontent.com/crowds-cure/cancer/master/public/screenshots/Anti-PD-1_Lung.jpg',
seriesDescription: 'Anti-PD-1_Lung',
seriesNumber: '2',
SeriesDescription: 'Anti-PD-1_Lung',
SeriesNumber: '2',
numImageFrames: 512,
displaySetInstanceUid: '10001-1',
displaySetInstanceUID: '10001-1',
stackPercentComplete: 30,
},
{
imageSrc:
'https://raw.githubusercontent.com/crowds-cure/cancer/master/public/screenshots/Anti-PD-1_MELANOMA.jpg',
seriesDescription: 'Anti-PD-1_MELANOMA',
seriesNumber: '2',
instanceNumber: '1',
SeriesDescription: 'Anti-PD-1_MELANOMA',
SeriesNumber: '2',
InstanceNumber: '1',
numImageFrames: 256,
displaySetInstanceUid: '10001-2',
displaySetInstanceUID: '10001-2',
stackPercentComplete: 70,
},
],
},
{
studyInstanceUid: '10002',
studyDescription: 'CPTAC',
StudyInstanceUID: '10002',
StudyDescription: 'CPTAC',
modalities: 'CT',
studyDate: '16-aug-2017',
StudyDate: '16-aug-2017',
active: true,
thumbnails: [
{
imageSrc:
'https://raw.githubusercontent.com/crowds-cure/cancer/master/public/screenshots/CPTAC-GBM.jpg',
seriesDescription: 'CPTAC-GBM',
SeriesDescription: 'CPTAC-GBM',
active: true,
seriesNumber: '2',
SeriesNumber: '2',
numImageFrames: 512,
displaySetInstanceUid: '10002-1',
displaySetInstanceUID: '10002-1',
stackPercentComplete: 100,
},
{
imageSrc:
'https://raw.githubusercontent.com/crowds-cure/cancer/master/public/screenshots/CPTAC-CM.jpg',
seriesDescription: 'CPTAC-CM',
seriesNumber: '2',
instanceNumber: '1',
displaySetInstanceUid: '10002-2',
SeriesDescription: 'CPTAC-CM',
SeriesNumber: '2',
InstanceNumber: '1',
displaySetInstanceUID: '10002-2',
numImageFrames: 256,
},
{
imageSrc:
'https://raw.githubusercontent.com/crowds-cure/cancer/master/public/screenshots/CPTAC-HNSCC.jpg',
seriesDescription: 'CPTAC-HNSCC',
seriesNumber: '2',
instanceNumber: '1',
displaySetInstanceUid: '10002-3',
SeriesDescription: 'CPTAC-HNSCC',
SeriesNumber: '2',
InstanceNumber: '1',
displaySetInstanceUID: '10002-3',
numImageFrames: 256,
},
{
imageSrc:
'https://raw.githubusercontent.com/crowds-cure/cancer/master/public/screenshots/CPTAC-LSCC.jpg',
seriesDescription: 'CPTAC-LSCC',
seriesNumber: '2',
instanceNumber: '1',
displaySetInstanceUid: '10002-4',
SeriesDescription: 'CPTAC-LSCC',
SeriesNumber: '2',
InstanceNumber: '1',
displaySetInstanceUID: '10002-4',
numImageFrames: 256,
},
],