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

Merge pull request #1841 from dannyrb/dannyrb/ohif-157/default-to-primary-study-expanded

Browse Source 
Dannyrb/ohif 157/default to primary study expanded
This commit is contained in:
Danny Brown 2020-06-30 22:10:11 -04:00 committed by GitHub
commit d739b52e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/default/src/Panels/PanelStudyBrowser.jsx
View File

@ -21,15 +21,13 @@ function PanelStudyBrowser({
// Tabs --> Studies --> DisplaySets --> Thumbnails // Tabs --> Studies --> DisplaySets --> Thumbnails
const [{ StudyInstanceUIDs }, dispatch] = useImageViewer(); const [{ StudyInstanceUIDs }, dispatch] = useImageViewer();
const [activeTabName, setActiveTabName] = useState('primary'); const [activeTabName, setActiveTabName] = useState('primary');
const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState( const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState([
[] ...StudyInstanceUIDs,
); ]);
const [studyDisplayList, setStudyDisplayList] = useState([]); const [studyDisplayList, setStudyDisplayList] = useState([]);
const [displaySets, setDisplaySets] = useState([]); const [displaySets, setDisplaySets] = useState([]);
const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState({}); const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState({});
console.log(DisplaySetService);
// ~~ studyDisplayList // ~~ studyDisplayList
useEffect(() => { useEffect(() => {
// Fetch all studies for the patient in each primary study // Fetch all studies for the patient in each primary study

10
extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx
View File

@ -31,9 +31,9 @@ function PanelStudyBrowserTracking({
sendTrackedMeasurementsEvent, sendTrackedMeasurementsEvent,
] = useTrackedMeasurements(); ] = useTrackedMeasurements();
const [activeTabName, setActiveTabName] = useState('primary'); const [activeTabName, setActiveTabName] = useState('primary');
const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState( const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState([
[] ...StudyInstanceUIDs,
); ]);
const [studyDisplayList, setStudyDisplayList] = useState([]); const [studyDisplayList, setStudyDisplayList] = useState([]);
const [displaySets, setDisplaySets] = useState([]); const [displaySets, setDisplaySets] = useState([]);
const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState({}); const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState({});
@ -308,6 +308,10 @@ function PanelStudyBrowserTracking({
} }
PanelStudyBrowserTracking.propTypes = { PanelStudyBrowserTracking.propTypes = {
MeasurementService: PropTypes.shape({
subscribe: PropTypes.func.isRequired,
EVENTS: PropTypes.object.isRequired,
}).isRequired,
DisplaySetService: PropTypes.shape({ DisplaySetService: PropTypes.shape({
EVENTS: PropTypes.object.isRequired, EVENTS: PropTypes.object.isRequired,
activeDisplaySets: PropTypes.arrayOf(PropTypes.object).isRequired, activeDisplaySets: PropTypes.arrayOf(PropTypes.object).isRequired,