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

Removes mask lines check

Browse Source
This commit is contained in:
psychedelicious 2022-10-28 01:38:00 +11:00
parent 5395707280
commit 3ddf1f6c3e
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/common/hooks/useCheckParameters.ts
View File

@ -30,8 +30,6 @@ export const useCheckParametersSelector = createSelector(
isProcessing: system.isProcessing, isProcessing: system.isProcessing,
isConnected: system.isConnected, isConnected: system.isConnected,
// inpainting // inpainting
isMaskEmpty:
inpainting.lines.filter((line) => line.tool === 'brush').length === 0,
hasInpaintingImage: Boolean(inpainting.imageToInpaint), hasInpaintingImage: Boolean(inpainting.imageToInpaint),
}; };
}, },
@ -56,7 +54,6 @@ const useCheckParameters = (): boolean => {
activeTabName, activeTabName,
isProcessing, isProcessing,
isConnected, isConnected,
isMaskEmpty,
hasInpaintingImage, hasInpaintingImage,
} = useAppSelector(useCheckParametersSelector); } = useAppSelector(useCheckParametersSelector);
@ -70,10 +67,7 @@ const useCheckParameters = (): boolean => {
return false; return false;
} }
if ( if (activeTabName === 'inpainting' && !hasInpaintingImage) {
activeTabName === 'inpainting' &&
(!hasInpaintingImage || isMaskEmpty)
) {
return false; return false;
} }
@ -113,7 +107,6 @@ const useCheckParameters = (): boolean => {
seedWeights, seedWeights,
seed, seed,
activeTabName, activeTabName,
isMaskEmpty,
hasInpaintingImage, hasInpaintingImage,
]); ]);
}; };

2
frontend/src/common/util/parameterTranslation.ts
View File

@ -127,7 +127,7 @@ export const frontendToBackendParameters = (
generationParameters.strength = img2imgStrength; generationParameters.strength = img2imgStrength;
generationParameters.fit = false; generationParameters.fit = false;
const maskDataURL = generateMask(maskImageElement, lines); const maskDataURL = generateMask(maskImageElement, lines, boundingBox);
generationParameters.init_mask = maskDataURL.split( generationParameters.init_mask = maskDataURL.split(
'data:image/png;base64,' 'data:image/png;base64,'

7
frontend/src/features/tabs/Inpainting/util/generateMask.ts
View File

@ -1,4 +1,5 @@
import Konva from 'konva'; import Konva from 'konva';
import { IRect } from 'konva/lib/types';
import { MaskLine } from '../inpaintingSlice'; import { MaskLine } from '../inpaintingSlice';
/** /**
@ -11,7 +12,11 @@ import { MaskLine } from '../inpaintingSlice';
* drawing the mask and compositing everything correctly to output a valid * drawing the mask and compositing everything correctly to output a valid
* mask image. * mask image.
*/ */
const generateMask = (image: HTMLImageElement, lines: MaskLine[]) => { const generateMask = (
image: HTMLImageElement,
lines: MaskLine[],
boundingBox: IRect
) => {
const { width, height } = image; const { width, height } = image;
const offscreenContainer = document.createElement('div'); const offscreenContainer = document.createElement('div');