Rename files to clarify they're "tracking" variants (simplify ide search)

This commit is contained in:
dannyrb 2020-05-27 08:20:54 -04:00
parent e748eb1974
commit e1c7a76025
2 changed files with 33 additions and 13 deletions

View File

@ -1,12 +1,13 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { StudyBrowser, useImageViewer } from '@ohif/ui';
import { useTrackedMeasurements } from '../../getContextModule';
/**
*
* @param {*} param0
*/
function PanelStudyBrowser({
function PanelStudyBrowserTracking({
DisplaySetService,
getImageSrc,
getStudiesForPatientByStudyInstanceUID,
@ -16,13 +17,32 @@ function PanelStudyBrowser({
// Normally you nest the components so the tree isn't so deep, and the data
// doesn't have to have such an intense shape. This works well enough for now.
// Tabs --> Studies --> DisplaySets --> Thumbnails
const [{ StudyInstanceUIDs }, dispatch] = useImageViewer();
const [{ StudyInstanceUIDs }, dispatchImageViewer] = useImageViewer();
const [
trackedMeasurements,
dispatchTrackedMeasurements,
] = useTrackedMeasurements();
console.warn('trackedMeasurementsState: ', trackedMeasurements);
const [activeTabName, setActiveTabName] = useState('primary');
const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState([]);
const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState(
[]
);
const [studyDisplayList, setStudyDisplayList] = useState([]);
const [displaySets, setDisplaySets] = useState([]);
const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState({});
// TODO: REPLACE ME
useEffect(() => {
dispatchTrackedMeasurements({
type: 'TRACK_SERIES',
payload: {
StudyInstanceUID:
'1.3.6.1.4.1.25403.345050719074.3824.20170125095258.1',
SeriesInstanceUID: '2.25.406240484039997428244790346419850090743',
},
});
}, [dispatchTrackedMeasurements]);
// ~~ studyDisplayList
useEffect(() => {
// Fetch all studies for the patient in each primary study
@ -66,7 +86,7 @@ function PanelStudyBrowser({
return { ...prevState, ...newImageSrcEntry };
});
});
}, []);
}, [DisplaySetService, dataSource, getImageSrc]);
// ~~ displaySets
useEffect(() => {
@ -78,7 +98,7 @@ function PanelStudyBrowser({
);
setDisplaySets(mappedDisplaySets);
}, [thumbnailImageSrcMap]);
}, [DisplaySetService.activeDisplaySets, thumbnailImageSrcMap]);
// ~~ subscriptions --> displaySets
useEffect(() => {
@ -123,7 +143,7 @@ function PanelStudyBrowser({
SubscriptionDisplaySetsAdded.unsubscribe();
SubscriptionDisplaySetsChanged.unsubscribe();
};
}, []);
}, [DisplaySetService, dataSource, getImageSrc, thumbnailImageSrcMap]);
const tabs = _createStudyBrowserTabs(
StudyInstanceUIDs,
@ -161,7 +181,7 @@ function PanelStudyBrowser({
);
}
PanelStudyBrowser.propTypes = {
PanelStudyBrowserTracking.propTypes = {
DisplaySetService: PropTypes.shape({
EVENTS: PropTypes.object.isRequired,
activeDisplaySets: PropTypes.arrayOf(PropTypes.object).isRequired,
@ -177,7 +197,7 @@ PanelStudyBrowser.propTypes = {
requestDisplaySetCreationForStudy: PropTypes.func.isRequired,
};
export default PanelStudyBrowser;
export default PanelStudyBrowserTracking;
/**
* Maps from the DataSource's format to a naturalized object

View File

@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
//
import PanelStudyBrowser from './PanelStudyBrowser';
import PanelStudyBrowserTracking from './PanelStudyBrowserTracking';
import getImageSrcFromImageId from './getImageSrcFromImageId';
import getStudiesForPatientByStudyInstanceUID from './getStudiesForPatientByStudyInstanceUID';
import requestDisplaySetCreationForStudy from './requestDisplaySetCreationForStudy';
@ -13,7 +13,7 @@ import requestDisplaySetCreationForStudy from './requestDisplaySetCreationForStu
* @param {object} commandsManager
* @param {object} extensionManager
*/
function WrappedPanelStudyBrowser({
function WrappedPanelStudyBrowserTracking({
commandsManager,
extensionManager,
servicesManager,
@ -34,7 +34,7 @@ function WrappedPanelStudyBrowser({
);
return (
<PanelStudyBrowser
<PanelStudyBrowserTracking
DisplaySetService={servicesManager.services.DisplaySetService}
dataSource={dataSource}
getImageSrc={_getImageSrcFromImageId}
@ -69,10 +69,10 @@ function _createGetImageSrcFromImageIdFn(getCommand) {
}
}
WrappedPanelStudyBrowser.propTypes = {
WrappedPanelStudyBrowserTracking.propTypes = {
commandsManager: PropTypes.object.isRequired,
extensionManager: PropTypes.object.isRequired,
servicesManager: PropTypes.object.isRequired,
};
export default WrappedPanelStudyBrowser;
export default WrappedPanelStudyBrowserTracking;