fix(layouts): and fix thumbnail in touch and update migration guide for 3.8 release (#4052)
This commit is contained in:
1 parent
28bc8914a8
commit
d250d04580
30 files changed
+209
-158
No files matched your search
@@ -25,7 +25,8 @@ function PanelStudyBrowser({
|
||||
// doesn't have to have such an intense shape. This works well enough for now.
|
||||
// Tabs --> Studies --> DisplaySets --> Thumbnails
|
||||
const { StudyInstanceUIDs } = useImageViewer();
|
||||
const [{ activeViewportId, viewports }, viewportGridService] = useViewportGrid();
|
||||
const [{ activeViewportId, viewports, isHangingProtocolLayout }, viewportGridService] =
|
||||
useViewportGrid();
|
||||
const [activeTabName, setActiveTabName] = useState('primary');
|
||||
const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState([
|
||||
...StudyInstanceUIDs,
|
||||
@@ -40,7 +41,8 @@ function PanelStudyBrowser({
|
||||
try {
|
||||
updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
|
||||
viewportId,
|
||||
displaySetInstanceUID
|
||||
displaySetInstanceUID,
|
||||
isHangingProtocolLayout
|
||||
);
|
||||
} catch (error) {
|
||||
console.warn(error);
|
||||
|
||||
@@ -58,6 +58,10 @@ const generateAdvancedPresets = ({ servicesManager }) => {
|
||||
}
|
||||
const displaySetInsaneUIDs = viewportGridService.getDisplaySetsUIDsForViewport(viewportId);
|
||||
|
||||
if (!displaySetInsaneUIDs) {
|
||||
return [];
|
||||
}
|
||||
|
||||
const displaySets = displaySetInsaneUIDs.map(uid => displaySetService.getDisplaySetByUID(uid));
|
||||
|
||||
return hangingProtocols
|
||||
|
||||
@@ -286,6 +286,7 @@ const commandsModule = ({
|
||||
const findOrCreateViewport = layoutFindOrCreate.bind(
|
||||
null,
|
||||
hangingProtocolService,
|
||||
isHangingProtocolLayout,
|
||||
stateReduce.viewportsByPosition
|
||||
);
|
||||
|
||||
@@ -303,7 +304,7 @@ const commandsModule = ({
|
||||
|
||||
toggleOneUp() {
|
||||
const viewportGridState = viewportGridService.getState();
|
||||
const { activeViewportId, viewports, layout } = viewportGridState;
|
||||
const { activeViewportId, viewports, layout, isHangingProtocolLayout } = viewportGridState;
|
||||
const { displaySetInstanceUIDs, displaySetOptions, viewportOptions } =
|
||||
viewports.get(activeViewportId);
|
||||
|
||||
@@ -330,7 +331,8 @@ const commandsModule = ({
|
||||
.map(displaySetInstanceUID =>
|
||||
hangingProtocolService.getViewportsRequireUpdate(
|
||||
viewportIdToUpdate,
|
||||
displaySetInstanceUID
|
||||
displaySetInstanceUID,
|
||||
isHangingProtocolLayout
|
||||
)
|
||||
)
|
||||
.flat();
|
||||
@@ -511,7 +513,8 @@ const commandsModule = ({
|
||||
|
||||
currentDisplaySets.sort(dsSortFn);
|
||||
|
||||
const { activeViewportId, viewports } = viewportGridService.getState();
|
||||
const { activeViewportId, viewports, isHangingProtocolLayout } =
|
||||
viewportGridService.getState();
|
||||
|
||||
const { displaySetInstanceUIDs } = viewports.get(activeViewportId);
|
||||
|
||||
@@ -545,7 +548,8 @@ const commandsModule = ({
|
||||
try {
|
||||
updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
|
||||
activeViewportId,
|
||||
displaySetInstanceUID
|
||||
displaySetInstanceUID,
|
||||
isHangingProtocolLayout
|
||||
);
|
||||
} catch (error) {
|
||||
console.warn(error);
|
||||
|
||||
@@ -16,6 +16,7 @@ import { StateSyncService } from '@ohif/core';
|
||||
*/
|
||||
export const findOrCreateViewport = (
|
||||
hangingProtocolService,
|
||||
isHangingProtocolLayout,
|
||||
viewportsByPosition,
|
||||
position: number,
|
||||
positionId: string,
|
||||
@@ -31,8 +32,13 @@ export const findOrCreateViewport = (
|
||||
if (!options.inDisplay) {
|
||||
options.inDisplay = [...viewportsByPosition.initialInDisplay];
|
||||
}
|
||||
// See if there is a default viewport for new views.
|
||||
const missing = hangingProtocolService.getMissingViewport(protocolId, stageIndex, options);
|
||||
|
||||
// See if there is a default viewport for new views
|
||||
const missing = hangingProtocolService.getMissingViewport(
|
||||
isHangingProtocolLayout ? protocolId : 'default',
|
||||
stageIndex,
|
||||
options
|
||||
);
|
||||
if (missing) {
|
||||
const displaySetInstanceUIDs = missing.displaySetsInfo.map(it => it.displaySetInstanceUID);
|
||||
options.inDisplay.push(...displaySetInstanceUIDs);
|
||||
|
||||
@@ -37,6 +37,8 @@ function getDisplaySetInfo(instances) {
|
||||
const { isDynamicVolume, timePoints } = dynamicVolumeInfo;
|
||||
let displaySetInfo;
|
||||
|
||||
const { appConfig } = appContext;
|
||||
|
||||
if (isDynamicVolume) {
|
||||
const timePoint = timePoints[0];
|
||||
const instancesMap = new Map();
|
||||
@@ -46,9 +48,9 @@ function getDisplaySetInfo(instances) {
|
||||
|
||||
const firstTimePointInstances = timePoint.map(imageId => instancesMap.get(imageId));
|
||||
|
||||
displaySetInfo = isDisplaySetReconstructable(firstTimePointInstances);
|
||||
displaySetInfo = isDisplaySetReconstructable(firstTimePointInstances, appConfig);
|
||||
} else {
|
||||
displaySetInfo = isDisplaySetReconstructable(instances);
|
||||
displaySetInfo = isDisplaySetReconstructable(instances, appConfig);
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
Reference in new issue
Block a user