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

ui: split the canvas mask blur and edge size setting

Browse Source
This commit is contained in:
blessedcoolant 2024-02-26 19:05:11 +05:30 committed by Kent Keirsey
parent 3efd9465eb
commit ba29376fba
9 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
invokeai/frontend/web/public/locales/en.json
View File

@ -1192,8 +1192,8 @@
"unableToInvoke": "Unable to Invoke"
},
"maskAdjustmentsHeader": "Mask Adjustments",
"maskBlur": "Blur",
"maskBlurMethod": "Blur Method",
"maskBlur": "Mask Blur",
"maskBlurMethod": "Mask Blur Method",
"maskEdge": "Mask Edge",
"negativePromptPlaceholder": "Negative Prompt",
"noiseSettings": "Noise",
@ -1479,8 +1479,8 @@
"Scheduler defines how to iteratively add noise to an image or how to update a sample based on a model's output."
]
},
"compositingBlur": {
"heading": "Blur",
"compositingMaskBlur": {
"heading": "Mask Blur",
"paragraphs": ["The blur radius of the mask."]
},
"compositingBlurMethod": {

2
invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts
View File

@ -6,7 +6,7 @@ export type Feature =
| 'paramNegativeConditioning'
| 'paramPositiveConditioning'
| 'paramScheduler'
| 'compositingBlur'
| 'compositingMaskBlur'
| 'compositingBlurMethod'
| 'compositingCoherencePass'
| 'compositingCoherenceMode'

4
invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasInpaintGraph.ts
View File

@ -58,13 +58,13 @@ export const buildCanvasInpaintGraph = (
seed,
vaePrecision,
shouldUseCpuNoise,
clipSkip,
seamlessXAxis,
seamlessYAxis,
canvasCoherenceMode,
canvasCoherenceMinDenoise,
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
if (!model) {
@ -156,7 +156,7 @@ export const buildCanvasInpaintGraph = (
id: CANVAS_OUTPUT,
is_intermediate: getIsIntermediate(state),
board: getBoardField(state),
mask_blur: canvasCoherenceEdgeSize,
mask_blur: maskBlur,
source_image: canvasInitImage,
},
},

3
invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasOutpaintGraph.ts
View File

@ -71,6 +71,7 @@ export const buildCanvasOutpaintGraph = (
canvasCoherenceMode,
canvasCoherenceMinDenoise,
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
if (!model) {
@ -176,7 +177,7 @@ export const buildCanvasOutpaintGraph = (
is_intermediate: getIsIntermediate(state),
board: getBoardField(state),
use_cache: false,
mask_blur: canvasCoherenceEdgeSize,
mask_blur: maskBlur,
},
},
edges: [

3
invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLInpaintGraph.ts
View File

@ -64,6 +64,7 @@ export const buildCanvasSDXLInpaintGraph = (
canvasCoherenceMode,
canvasCoherenceMinDenoise,
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
const { refinerModel, refinerStart } = state.sdxl;
@ -157,7 +158,7 @@ export const buildCanvasSDXLInpaintGraph = (
id: CANVAS_OUTPUT,
is_intermediate: getIsIntermediate(state),
board: getBoardField(state),
mask_blur: canvasCoherenceEdgeSize,
mask_blur: maskBlur,
source_image: canvasInitImage,
},
},

3
invokeai/frontend/web/src/features/nodes/util/graph/buildCanvasSDXLOutpaintGraph.ts
View File

@ -71,6 +71,7 @@ export const buildCanvasSDXLOutpaintGraph = (
canvasCoherenceMode,
canvasCoherenceMinDenoise,
canvasCoherenceEdgeSize,
maskBlur,
} = state.generation;
const { refinerModel, refinerStart } = state.sdxl;
@ -176,7 +177,7 @@ export const buildCanvasSDXLOutpaintGraph = (
is_intermediate: getIsIntermediate(state),
board: getBoardField(state),
use_cache: false,
mask_blur: canvasCoherenceEdgeSize,
mask_blur: maskBlur,
},
},
edges: [

2
invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlur.tsx
View File

@ -26,7 +26,7 @@ const ParamMaskBlur = () => {
return (
<FormControl>
<InformationalPopover feature="compositingBlur">
<InformationalPopover feature="compositingMaskBlur">
<FormLabel>{t('parameters.maskBlur')}</FormLabel>
</InformationalPopover>
<CompositeSlider

4
invokeai/frontend/web/src/features/settingsAccordions/components/CompositingSettingsAccordion/CompositingSettingsAccordion.tsx
View File

@ -12,6 +12,7 @@ import {
import ParamCanvasCoherenceEdgeSize from 'features/parameters/components/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceEdgeSize';
import ParamCanvasCoherenceMinDenoise from 'features/parameters/components/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMinDenoise';
import ParamCanvasCoherenceMode from 'features/parameters/components/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode';
import ParamMaskBlur from 'features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlur';
import ParamInfillMethod from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillMethod';
import ParamInfillOptions from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillOptions';
import { useStandaloneAccordionToggle } from 'features/settingsAccordions/hooks/useStandaloneAccordionToggle';
@ -43,8 +44,9 @@ export const CompositingSettingsAccordion = memo(() => {
<ParamCanvasCoherenceMode />
<ParamCanvasCoherenceEdgeSize />
<ParamCanvasCoherenceMinDenoise />
<ParamMaskBlur />
{/* <ParamMaskBlurMethod />
<ParamMaskBlur /> */}
*/}
</FormControlGroup>
</Flex>
</TabPanel>

8
invokeai/frontend/web/src/features/system/store/configSlice.ts
View File

@ -88,9 +88,9 @@ export const initialConfigState: AppConfig = {
},
canvasCoherenceEdgeSize: {
initial: 16,
sliderMin: 16,
sliderMax: 512,
numberInputMin: 16,
sliderMin: 0,
sliderMax: 128,
numberInputMin: 0,
numberInputMax: 1024,
fineStep: 8,
coarseStep: 16,
@ -134,7 +134,7 @@ export const initialConfigState: AppConfig = {
maskBlur: {
initial: 16,
sliderMin: 0,
sliderMax: 64,
sliderMax: 128,
numberInputMin: 0,
numberInputMax: 512,
fineStep: 1,