chore: 3.11 Recovery 1 (#5514)
This commit is contained in:
1 parent
522531cc5c
commit
93dabb3805
147 files changed
+2948
-5922
No files matched your search
@@ -37,19 +37,19 @@
|
||||
"@ohif/core": "3.11.0",
|
||||
"@ohif/i18n": "3.11.0",
|
||||
"dcmjs": "0.43.1",
|
||||
"dicomweb-client": "^0.10.4",
|
||||
"prop-types": "^15.6.2",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-i18next": "^12.2.2",
|
||||
"react-window": "^1.8.9",
|
||||
"dicomweb-client": "0.10.4",
|
||||
"prop-types": "15.8.1",
|
||||
"react": "18.3.1",
|
||||
"react-dom": "18.3.1",
|
||||
"react-i18next": "12.3.1",
|
||||
"react-window": "1.8.11",
|
||||
"webpack": "5.89.0",
|
||||
"webpack-merge": "^5.7.3"
|
||||
"webpack-merge": "5.10.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.20.13",
|
||||
"@cornerstonejs/calculate-suv": "^1.1.0",
|
||||
"lodash.get": "^4.4.2",
|
||||
"lodash.uniqby": "^4.7.0"
|
||||
"@babel/runtime": "7.28.2",
|
||||
"@cornerstonejs/calculate-suv": "1.1.0",
|
||||
"lodash.get": "4.4.2",
|
||||
"lodash.uniqby": "4.7.0"
|
||||
}
|
||||
}
|
||||
@@ -262,17 +262,19 @@ function createDicomJSONApi(dicomJsonConfig) {
|
||||
|
||||
const { StudyInstanceUID, SeriesInstanceUID } = displaySet;
|
||||
const study = findStudies('StudyInstanceUID', StudyInstanceUID)[0];
|
||||
const series = study.series.find(s => s.SeriesInstanceUID === SeriesInstanceUID) || [];
|
||||
const series = study.series.find(s => s.SeriesInstanceUID === SeriesInstanceUID) || {};
|
||||
|
||||
const instanceMap = new Map();
|
||||
series.instances.forEach(instance => {
|
||||
if (instance?.metadata?.SOPInstanceUID) {
|
||||
const { metadata, url } = instance;
|
||||
const existingInstances = instanceMap.get(metadata.SOPInstanceUID) || [];
|
||||
existingInstances.push({ ...metadata, url });
|
||||
instanceMap.set(metadata.SOPInstanceUID, existingInstances);
|
||||
}
|
||||
});
|
||||
if (series.instances) {
|
||||
series.instances.forEach(instance => {
|
||||
if (instance?.metadata?.SOPInstanceUID) {
|
||||
const { metadata, url } = instance;
|
||||
const existingInstances = instanceMap.get(metadata.SOPInstanceUID) || [];
|
||||
existingInstances.push({ ...metadata, url });
|
||||
instanceMap.set(metadata.SOPInstanceUID, existingInstances);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
displaySet.images.forEach(instance => {
|
||||
const NumberOfFrames = instance.NumberOfFrames || 1;
|
||||
|
||||
@@ -65,6 +65,11 @@ const commandsModule = ({
|
||||
* @param options.removeFirst - Optional flag to remove the display set first if it's already added
|
||||
*/
|
||||
addDisplaySetAsLayer: ({ viewportId, displaySetInstanceUID, removeFirst = false }) => {
|
||||
if (!viewportId) {
|
||||
const { activeViewportId } = servicesManager.services.viewportGridService.getState();
|
||||
viewportId = activeViewportId;
|
||||
}
|
||||
|
||||
if (!viewportId || !displaySetInstanceUID) {
|
||||
console.warn('Missing required parameters for addDisplaySetAsLayer command');
|
||||
return;
|
||||
|
||||
@@ -8,31 +8,13 @@ export default {
|
||||
id: 'tagBrowser',
|
||||
label: 'Tag Browser',
|
||||
iconName: 'DicomTagBrowser',
|
||||
onClick: ({ commandsManager, displaySetInstanceUID }: withAppTypes) => {
|
||||
commandsManager.runCommand('openDICOMTagViewer', {
|
||||
displaySetInstanceUID,
|
||||
});
|
||||
},
|
||||
commands: 'openDICOMTagViewer',
|
||||
},
|
||||
{
|
||||
id: 'addAsLayer',
|
||||
label: 'Add as Layer',
|
||||
iconName: 'ViewportViews',
|
||||
onClick: ({ commandsManager, displaySetInstanceUID, servicesManager }: withAppTypes) => {
|
||||
const { viewportGridService } = servicesManager.services;
|
||||
|
||||
// Get the active viewport
|
||||
const { activeViewportId } = viewportGridService.getState();
|
||||
if (!activeViewportId) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Use the new command to add the display set as a layer
|
||||
commandsManager.runCommand('addDisplaySetAsLayer', {
|
||||
viewportId: activeViewportId,
|
||||
displaySetInstanceUID,
|
||||
});
|
||||
},
|
||||
commands: 'addDisplaySetAsLayer',
|
||||
},
|
||||
],
|
||||
'studyBrowser.sortFunctions': [
|
||||
|
||||
Reference in new issue
Block a user