Remove Inpaint Replace

2024-08-30 20:32:17 +00:00 · 2023-01-31 22:30:18 -05:00 · 2023-01-31 22:30:18 -05:00 · 07462d1d99
commit 07462d1d99
parent 31146eb797
27 changed files with 0 additions and 109 deletions
--- a/frontend/dist/locales/options/de.json
+++ b/frontend/dist/locales/options/de.json
@ -30,7 +30,6 @@
  "seamBlur": "Nahtunschärfe",
  "seamStrength": "Stärke der Naht",
  "seamSteps": "Nahtstufen",
-  "inpaintReplace": "Inpaint Ersetzen",
  "scaleBeforeProcessing": "Skalieren vor der Verarbeitung",
  "scaledWidth": "Skaliert W",
  "scaledHeight": "Skaliert H",
--- a/frontend/dist/locales/options/en-US.json
+++ b/frontend/dist/locales/options/en-US.json
@ -30,7 +30,6 @@
  "seamBlur": "Seam Blur",
  "seamStrength": "Seam Strength",
  "seamSteps": "Seam Steps",
-  "inpaintReplace": "Inpaint Replace",
  "scaleBeforeProcessing": "Scale Before Processing",
  "scaledWidth": "Scaled W",
  "scaledHeight": "Scaled H",
--- a/frontend/dist/locales/options/en.json
+++ b/frontend/dist/locales/options/en.json
@ -30,7 +30,6 @@
  "seamBlur": "Seam Blur",
  "seamStrength": "Seam Strength",
  "seamSteps": "Seam Steps",
-  "inpaintReplace": "Inpaint Replace",
  "scaleBeforeProcessing": "Scale Before Processing",
  "scaledWidth": "Scaled W",
  "scaledHeight": "Scaled H",
--- a/frontend/dist/locales/options/es.json
+++ b/frontend/dist/locales/options/es.json
@ -30,7 +30,6 @@
  "seamBlur": "Desenfoque del parche",
  "seamStrength": "Fuerza del parche",
  "seamSteps": "Pasos del parche",
-  "inpaintReplace": "Reemplazar impresión interior",
  "scaleBeforeProcessing": "Redimensionar antes de procesar",
  "scaledWidth": "Ancho escalado",
  "scaledHeight": "Alto escalado",
--- a/frontend/dist/locales/options/it.json
+++ b/frontend/dist/locales/options/it.json
@ -30,7 +30,6 @@
  "seamBlur": "Sfocatura cucitura",
  "seamStrength": "Forza della cucitura",
  "seamSteps": "Passaggi di cucitura",
-  "inpaintReplace": "Inpaint Sostituisci",
  "scaleBeforeProcessing": "Scala prima dell'elaborazione",
  "scaledWidth": "Larghezza ridimensionata",
  "scaledHeight": "Altezza ridimensionata",
--- a/frontend/dist/locales/options/ja.json
+++ b/frontend/dist/locales/options/ja.json
@ -30,7 +30,6 @@
    "seamBlur": "Seam Blur",
    "seamStrength": "Seam Strength",
    "seamSteps": "Seam Steps",
-    "inpaintReplace": "Inpaint Replace",
    "scaleBeforeProcessing": "処理前のスケール",
    "scaledWidth": "幅のスケール",
    "scaledHeight": "高さのスケール",
--- a/frontend/dist/locales/options/nl.json
+++ b/frontend/dist/locales/options/nl.json
@ -30,7 +30,6 @@
  "seamBlur": "Vervaging naad",
  "seamStrength": "Sterkte naad",
  "seamSteps": "Stappen naad",
-  "inpaintReplace": "Inpaintvervanging",
  "scaleBeforeProcessing": "Schalen voor verwerking",
  "scaledWidth": "Geschaalde B",
  "scaledHeight": "Geschaalde H",
--- a/frontend/dist/locales/options/pl.json
+++ b/frontend/dist/locales/options/pl.json
@ -30,7 +30,6 @@
  "seamBlur": "Rozmycie",
  "seamStrength": "Siła",
  "seamSteps": "Kroki",
-  "inpaintReplace": "Tryb podmiany",
  "scaleBeforeProcessing": "Tryb skalowania",
  "scaledWidth": "Sk. do szer.",
  "scaledHeight": "Sk. do wys.",
--- a/frontend/dist/locales/options/pt_br.json
+++ b/frontend/dist/locales/options/pt_br.json
@ -30,7 +30,6 @@
  "seamBlur": "Desfoque da Fronteira",
  "seamStrength": "Força da Fronteira",
  "seamSteps": "Passos da Fronteira",
-  "inpaintReplace": "Substituir com Inpaint",
  "scaleBeforeProcessing": "Escala Antes do Processamento",
  "scaledWidth": "L Escalada",
  "scaledHeight": "A Escalada",
--- a/frontend/dist/locales/options/ru.json
+++ b/frontend/dist/locales/options/ru.json
@ -30,7 +30,6 @@
  "seamBlur": "Размытие шва",
  "seamStrength": "Сила шва",
  "seamSteps": "Шаги шва",
-  "inpaintReplace": "Inpaint-замена",
  "scaleBeforeProcessing": "Масштабировать",
  "scaledWidth": "Масштаб Ш",
  "scaledHeight": "Масштаб В",
--- a/frontend/dist/locales/options/zh_cn.json
+++ b/frontend/dist/locales/options/zh_cn.json
@ -30,7 +30,6 @@
  "seamBlur": "接缝模糊",
  "seamStrength": "接缝强度",
  "seamSteps": "接缝步数",
-  "inpaintReplace": "内画替换",
  "scaleBeforeProcessing": "处理前缩放",
  "scaledWidth": "缩放宽度",
  "scaledHeight": "缩放长度",
--- a/frontend/public/locales/options/de.json
+++ b/frontend/public/locales/options/de.json
@ -30,7 +30,6 @@
  "seamBlur": "Nahtunschärfe",
  "seamStrength": "Stärke der Naht",
  "seamSteps": "Nahtstufen",
-  "inpaintReplace": "Inpaint Ersetzen",
  "scaleBeforeProcessing": "Skalieren vor der Verarbeitung",
  "scaledWidth": "Skaliert W",
  "scaledHeight": "Skaliert H",
--- a/frontend/public/locales/options/en-US.json
+++ b/frontend/public/locales/options/en-US.json
@ -30,7 +30,6 @@
  "seamBlur": "Seam Blur",
  "seamStrength": "Seam Strength",
  "seamSteps": "Seam Steps",
-  "inpaintReplace": "Inpaint Replace",
  "scaleBeforeProcessing": "Scale Before Processing",
  "scaledWidth": "Scaled W",
  "scaledHeight": "Scaled H",
--- a/frontend/public/locales/options/en.json
+++ b/frontend/public/locales/options/en.json
@ -30,7 +30,6 @@
  "seamBlur": "Seam Blur",
  "seamStrength": "Seam Strength",
  "seamSteps": "Seam Steps",
-  "inpaintReplace": "Inpaint Replace",
  "scaleBeforeProcessing": "Scale Before Processing",
  "scaledWidth": "Scaled W",
  "scaledHeight": "Scaled H",
--- a/frontend/public/locales/options/es.json
+++ b/frontend/public/locales/options/es.json
@ -30,7 +30,6 @@
  "seamBlur": "Desenfoque del parche",
  "seamStrength": "Fuerza del parche",
  "seamSteps": "Pasos del parche",
-  "inpaintReplace": "Reemplazar impresión interior",
  "scaleBeforeProcessing": "Redimensionar antes de procesar",
  "scaledWidth": "Ancho escalado",
  "scaledHeight": "Alto escalado",
--- a/frontend/public/locales/options/it.json
+++ b/frontend/public/locales/options/it.json
@ -30,7 +30,6 @@
  "seamBlur": "Sfocatura cucitura",
  "seamStrength": "Forza della cucitura",
  "seamSteps": "Passaggi di cucitura",
-  "inpaintReplace": "Inpaint Sostituisci",
  "scaleBeforeProcessing": "Scala prima dell'elaborazione",
  "scaledWidth": "Larghezza ridimensionata",
  "scaledHeight": "Altezza ridimensionata",
--- a/frontend/public/locales/options/ja.json
+++ b/frontend/public/locales/options/ja.json
@ -30,7 +30,6 @@
    "seamBlur": "Seam Blur",
    "seamStrength": "Seam Strength",
    "seamSteps": "Seam Steps",
-    "inpaintReplace": "Inpaint Replace",
    "scaleBeforeProcessing": "処理前のスケール",
    "scaledWidth": "幅のスケール",
    "scaledHeight": "高さのスケール",
--- a/frontend/public/locales/options/nl.json
+++ b/frontend/public/locales/options/nl.json
@ -30,7 +30,6 @@
  "seamBlur": "Vervaging naad",
  "seamStrength": "Sterkte naad",
  "seamSteps": "Stappen naad",
-  "inpaintReplace": "Inpaintvervanging",
  "scaleBeforeProcessing": "Schalen voor verwerking",
  "scaledWidth": "Geschaalde B",
  "scaledHeight": "Geschaalde H",
--- a/frontend/public/locales/options/pl.json
+++ b/frontend/public/locales/options/pl.json
@ -30,7 +30,6 @@
  "seamBlur": "Rozmycie",
  "seamStrength": "Siła",
  "seamSteps": "Kroki",
-  "inpaintReplace": "Tryb podmiany",
  "scaleBeforeProcessing": "Tryb skalowania",
  "scaledWidth": "Sk. do szer.",
  "scaledHeight": "Sk. do wys.",
--- a/frontend/public/locales/options/pt_br.json
+++ b/frontend/public/locales/options/pt_br.json
@ -30,7 +30,6 @@
  "seamBlur": "Desfoque da Fronteira",
  "seamStrength": "Força da Fronteira",
  "seamSteps": "Passos da Fronteira",
-  "inpaintReplace": "Substituir com Inpaint",
  "scaleBeforeProcessing": "Escala Antes do Processamento",
  "scaledWidth": "L Escalada",
  "scaledHeight": "A Escalada",
--- a/frontend/public/locales/options/ru.json
+++ b/frontend/public/locales/options/ru.json
@ -30,7 +30,6 @@
  "seamBlur": "Размытие шва",
  "seamStrength": "Сила шва",
  "seamSteps": "Шаги шва",
-  "inpaintReplace": "Inpaint-замена",
  "scaleBeforeProcessing": "Масштабировать",
  "scaledWidth": "Масштаб Ш",
  "scaledHeight": "Масштаб В",
--- a/frontend/public/locales/options/zh_cn.json
+++ b/frontend/public/locales/options/zh_cn.json
@ -30,7 +30,6 @@
  "seamBlur": "接缝模糊",
  "seamStrength": "接缝强度",
  "seamSteps": "接缝步数",
-  "inpaintReplace": "内画替换",
  "scaleBeforeProcessing": "处理前缩放",
  "scaledWidth": "缩放宽度",
  "scaledHeight": "缩放长度",
--- a/frontend/src/common/util/parameterTranslation.ts
+++ b/frontend/src/common/util/parameterTranslation.ts
@ -196,8 +196,6 @@ export const frontendToBackendParameters = (
      layerState: { objects },
      boundingBoxCoordinates,
      boundingBoxDimensions,
-      inpaintReplace,
-      shouldUseInpaintReplace,
      stageScale,
      isMaskEnabled,
      shouldPreserveMaskedArea,
@ -223,10 +221,6 @@ export const frontendToBackendParameters = (

    generationParameters.invert_mask = shouldPreserveMaskedArea;

-    if (shouldUseInpaintReplace) {
-      generationParameters.inpaint_replace = inpaintReplace;
-    }
-
    generationParameters.bounding_box = boundingBox;

    const tempScale = canvasBaseLayer.scale();
--- a/frontend/src/features/canvas/store/canvasSlice.ts
+++ b/frontend/src/features/canvas/store/canvasSlice.ts
@ -49,7 +49,6 @@ const initialCanvasState: CanvasState = {
  cursorPosition: null,
  doesCanvasNeedScaling: false,
  futureLayerStates: [],
-  inpaintReplace: 0.1,
  isCanvasInitialized: false,
  isDrawing: false,
  isMaskEnabled: true,
@ -82,7 +81,6 @@ const initialCanvasState: CanvasState = {
  shouldShowStagingImage: true,
  shouldShowStagingOutline: true,
  shouldSnapToGrid: true,
-  shouldUseInpaintReplace: false,
  stageCoordinates: { x: 0, y: 0 },
  stageDimensions: { width: 0, height: 0 },
  stageScale: 1,
@ -264,12 +262,6 @@ export const canvasSlice = createSlice({
      state.pastLayerStates = [];
      state.futureLayerStates = [];
    },
-    setShouldUseInpaintReplace: (state, action: PayloadAction<boolean>) => {
-      state.shouldUseInpaintReplace = action.payload;
-    },
-    setInpaintReplace: (state, action: PayloadAction<number>) => {
-      state.inpaintReplace = action.payload;
-    },
    setShouldLockBoundingBox: (state, action: PayloadAction<boolean>) => {
      state.shouldLockBoundingBox = action.payload;
    },
@ -858,7 +850,6 @@ export const {
  setCursorPosition,
  setDoesCanvasNeedScaling,
  setInitialCanvasImage,
-  setInpaintReplace,
  setIsDrawing,
  setIsMaskEnabled,
  setIsMouseOverBoundingBox,
@ -885,7 +876,6 @@ export const {
  setShouldShowStagingImage,
  setShouldShowStagingOutline,
  setShouldSnapToGrid,
-  setShouldUseInpaintReplace,
  setStageCoordinates,
  setStageScale,
  setTool,
--- a/frontend/src/features/canvas/store/canvasTypes.ts
+++ b/frontend/src/features/canvas/store/canvasTypes.ts
@ -125,7 +125,6 @@ export interface CanvasState {
  cursorPosition: Vector2d | null;
  doesCanvasNeedScaling: boolean;
  futureLayerStates: CanvasLayerState[];
-  inpaintReplace: number;
  intermediateImage?: InvokeAI.Image;
  isCanvasInitialized: boolean;
  isDrawing: boolean;
@ -159,7 +158,6 @@ export interface CanvasState {
  shouldShowStagingImage: boolean;
  shouldShowStagingOutline: boolean;
  shouldSnapToGrid: boolean;
-  shouldUseInpaintReplace: boolean;
  stageCoordinates: Vector2d;
  stageDimensions: Dimensions;
  stageScale: number;
--- a/frontend/src/features/options/components/AdvancedOptions/Canvas/InfillAndScalingOptions.tsx
+++ b/frontend/src/features/options/components/AdvancedOptions/Canvas/InfillAndScalingOptions.tsx
@ -21,7 +21,6 @@ import { systemSelector } from 'features/system/store/systemSelectors';
 import _ from 'lodash';
 import { ChangeEvent } from 'react';
 import { useTranslation } from 'react-i18next';
-import InpaintReplace from './InpaintReplace';

 const selector = createSelector(
  [optionsSelector, systemSelector, canvasSelector],
@ -148,7 +147,6 @@ const InfillAndScalingOptions = () => {
        withReset
        handleReset={handleResetScaledHeight}
      />
-      <InpaintReplace />
      <IAISelect
        label={t('options:infillMethod')}
        value={infillMethod}
--- a/frontend/src/features/options/components/AdvancedOptions/Canvas/InpaintReplace.tsx
+++ b/frontend/src/features/options/components/AdvancedOptions/Canvas/InpaintReplace.tsx
@ -1,67 +0,0 @@
-import React, { ChangeEvent } from 'react';
-import { useAppDispatch, useAppSelector } from '../../../../../app/storeHooks';
-import _ from 'lodash';
-import { createSelector } from '@reduxjs/toolkit';
-import IAISwitch from '../../../../../common/components/IAISwitch';
-import IAISlider from '../../../../../common/components/IAISlider';
-import { Flex } from '@chakra-ui/react';
-import {
-  setInpaintReplace,
-  setShouldUseInpaintReplace,
-} from 'features/canvas/store/canvasSlice';
-import { canvasSelector } from 'features/canvas/store/canvasSelectors';
-import { useTranslation } from 'react-i18next';
-
-const selector = createSelector(
-  canvasSelector,
-  (canvas) => {
-    const { inpaintReplace, shouldUseInpaintReplace } = canvas;
-    return {
-      inpaintReplace,
-      shouldUseInpaintReplace,
-    };
-  },
-  {
-    memoizeOptions: {
-      resultEqualityCheck: _.isEqual,
-    },
-  }
-);
-
-export default function InpaintReplace() {
-  const { inpaintReplace, shouldUseInpaintReplace } = useAppSelector(selector);
-
-  const dispatch = useAppDispatch();
-
-  const { t } = useTranslation();
-
-  return (
-    <Flex alignItems={'center'} columnGap={'0.2rem'}>
-      <IAISlider
-        label={t('options:inpaintReplace')}
-        value={inpaintReplace}
-        onChange={(v: number) => {
-          dispatch(setInpaintReplace(v));
-        }}
-        min={0}
-        max={1.0}
-        step={0.05}
-        isInteger={false}
-        isSliderDisabled={!shouldUseInpaintReplace}
-        withSliderMarks
-        sliderMarkRightOffset={-2}
-        withReset
-        handleReset={() => dispatch(setInpaintReplace(0.1))}
-        withInput
-        isResetDisabled={!shouldUseInpaintReplace}
-      />
-      <IAISwitch
-        isChecked={shouldUseInpaintReplace}
-        onChange={(e: ChangeEvent<HTMLInputElement>) =>
-          dispatch(setShouldUseInpaintReplace(e.target.checked))
-        }
-        marginTop="1.25rem"
-      />
-    </Flex>
-  );
-}