Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): scaled bbox loses sync

Browse Source
This commit is contained in:
psychedelicious 2024-08-26 08:55:33 +10:00
parent f917cefa84
commit 4b49c1dd6b
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
invokeai/frontend/web/src/features/controlLayers/store/bboxReducers.ts
View File

@ -8,7 +8,14 @@ import { ASPECT_RATIO_MAP, initialAspectRatioState } from 'features/parameters/c
import type { AspectRatioID } from 'features/parameters/components/DocumentSize/types'; import type { AspectRatioID } from 'features/parameters/components/DocumentSize/types';
import { getOptimalDimension } from 'features/parameters/util/optimalDimension'; import { getOptimalDimension } from 'features/parameters/util/optimalDimension';
import type { IRect } from 'konva/lib/types'; import type { IRect } from 'konva/lib/types';
import { pick } from 'lodash-es';
const syncScaledSize = (state: CanvasV2State) => {
if (state.bbox.scaleMethod === 'auto') {
const optimalDimension = getOptimalDimension(state.params.model);
const { width, height } = state.bbox.rect;
state.bbox.scaledSize = getScaledBoundingBoxDimensions({ width, height }, optimalDimension);
}
};
export const bboxReducers = { export const bboxReducers = {
bboxScaledSizeChanged: (state, action: PayloadAction<Partial<Dimensions>>) => { bboxScaledSizeChanged: (state, action: PayloadAction<Partial<Dimensions>>) => {
@ -16,21 +23,11 @@ export const bboxReducers = {
}, },
bboxScaleMethodChanged: (state, action: PayloadAction<BoundingBoxScaleMethod>) => { bboxScaleMethodChanged: (state, action: PayloadAction<BoundingBoxScaleMethod>) => {
state.bbox.scaleMethod = action.payload; state.bbox.scaleMethod = action.payload;
syncScaledSize(state);
if (action.payload === 'auto') {
const optimalDimension = getOptimalDimension(state.params.model);
const size = pick(state.bbox.rect, 'width', 'height');
state.bbox.scaledSize = getScaledBoundingBoxDimensions(size, optimalDimension);
}
}, },
bboxChanged: (state, action: PayloadAction<IRect>) => { bboxChanged: (state, action: PayloadAction<IRect>) => {
state.bbox.rect = action.payload; state.bbox.rect = action.payload;
syncScaledSize(state);
if (state.bbox.scaleMethod === 'auto') {
const optimalDimension = getOptimalDimension(state.params.model);
const size = pick(state.bbox.rect, 'width', 'height');
state.bbox.scaledSize = getScaledBoundingBoxDimensions(size, optimalDimension);
}
}, },
bboxWidthChanged: (state, action: PayloadAction<{ width: number; updateAspectRatio?: boolean; clamp?: boolean }>) => { bboxWidthChanged: (state, action: PayloadAction<{ width: number; updateAspectRatio?: boolean; clamp?: boolean }>) => {
const { width, updateAspectRatio, clamp } = action.payload; const { width, updateAspectRatio, clamp } = action.payload;
@ -45,6 +42,8 @@ export const bboxReducers = {
state.bbox.aspectRatio.id = 'Free'; state.bbox.aspectRatio.id = 'Free';
state.bbox.aspectRatio.isLocked = false; state.bbox.aspectRatio.isLocked = false;
} }
syncScaledSize(state);
}, },
bboxHeightChanged: ( bboxHeightChanged: (
state, state,
@ -63,6 +62,8 @@ export const bboxReducers = {
state.bbox.aspectRatio.id = 'Free'; state.bbox.aspectRatio.id = 'Free';
state.bbox.aspectRatio.isLocked = false; state.bbox.aspectRatio.isLocked = false;
} }
syncScaledSize(state);
}, },
bboxAspectRatioLockToggled: (state) => { bboxAspectRatioLockToggled: (state) => {
state.bbox.aspectRatio.isLocked = !state.bbox.aspectRatio.isLocked; state.bbox.aspectRatio.isLocked = !state.bbox.aspectRatio.isLocked;
@ -82,6 +83,8 @@ export const bboxReducers = {
state.bbox.rect.width = width; state.bbox.rect.width = width;
state.bbox.rect.height = height; state.bbox.rect.height = height;
} }
syncScaledSize(state);
}, },
bboxDimensionsSwapped: (state) => { bboxDimensionsSwapped: (state) => {
state.bbox.aspectRatio.value = 1 / state.bbox.aspectRatio.value; state.bbox.aspectRatio.value = 1 / state.bbox.aspectRatio.value;
@ -99,6 +102,8 @@ export const bboxReducers = {
state.bbox.rect.height = height; state.bbox.rect.height = height;
state.bbox.aspectRatio.id = ASPECT_RATIO_MAP[state.bbox.aspectRatio.id].inverseID; state.bbox.aspectRatio.id = ASPECT_RATIO_MAP[state.bbox.aspectRatio.id].inverseID;
} }
syncScaledSize(state);
}, },
bboxSizeOptimized: (state) => { bboxSizeOptimized: (state) => {
const optimalDimension = getOptimalDimension(state.params.model); const optimalDimension = getOptimalDimension(state.params.model);
@ -111,5 +116,7 @@ export const bboxReducers = {
state.bbox.rect.width = optimalDimension; state.bbox.rect.width = optimalDimension;
state.bbox.rect.height = optimalDimension; state.bbox.rect.height = optimalDimension;
} }
syncScaledSize(state);
}, },
} satisfies SliceCaseReducers<CanvasV2State>; } satisfies SliceCaseReducers<CanvasV2State>;