feat(ui): denoising strength UI

invokeai/frontend/web/public/locales/en.json

@@ -997,6 +997,7 @@
         "controlNetControlMode": "Control Mode",
         "copyImage": "Copy Image",
         "denoisingStrength": "Denoising Strength",
+        "noRasterLayers": "No Raster Layers",
         "downloadImage": "Download Image",
         "general": "General",
         "guidance": "Guidance",
@@ -1412,8 +1413,9 @@
         "paramDenoisingStrength": {
             "heading": "Denoising Strength",
             "paragraphs": [
-                "How much noise is added to the input image.",
-                "0 will result in an identical image, while 1 will result in a completely new image."
+                "Controls how much the generated image varies from the raster layer(s).",
+                "Lower strength stays closer to the combined visible raster layers. Higher strength relies more on the global prompt.",
+                "When there are no raster layers with visible content, this setting is ignored."
             ]
         },
         "paramHeight": {

invokeai/frontend/web/src/common/components/InformationalPopover/constants.ts

@@ -1,5 +1,6 @@
 import type { PopoverProps } from '@invoke-ai/ui-library';
 import commercialLicenseBg from 'public/assets/images/commercial-license-bg.png';
+import denoisingStrength from 'public/assets/images/denoising-strength.png';
 
 export type Feature =
   | 'clipSkip'
@@ -138,6 +139,7 @@ export const POPOVER_DATA: { [key in Feature]?: PopoverData } = {
   },
   paramDenoisingStrength: {
     href: 'https://support.invoke.ai/support/solutions/articles/151000094998-image-to-image',
+    image: denoisingStrength,
   },
   paramHrf: {
     href: 'https://support.invoke.ai/support/solutions/articles/151000096700-how-can-i-get-larger-images-what-does-upscaling-do-',

invokeai/frontend/web/src/common/components/WavyLine.tsx

@@ -0,0 +1,57 @@
+type Props = {
+  /**
+   * The amplitude of the wave. 0 is a straight line, higher values create more pronounced waves.
+   */
+  amplitude: number;
+  /**
+   * The number of segments in the line. More segments create a smoother wave.
+   */
+  segments?: number;
+  /**
+   * The color of the wave.
+   */
+  stroke: string;
+  /**
+   * The width of the wave.
+   */
+  strokeWidth: number;
+  /**
+   * The width of the SVG.
+   */
+  width: number;
+  /**
+   * The height of the SVG.
+   */
+  height: number;
+};
+
+const WavyLine = ({ amplitude, stroke, strokeWidth, width, height, segments = 5 }: Props) => {
+  // Calculate the path dynamically based on waviness
+  const generatePath = () => {
+    if (amplitude === 0) {
+      // If waviness is 0, return a straight line
+      return `M0,${height / 2} L${width},${height / 2}`;
+    }
+
+    const clampedAmplitude = Math.min(height / 2, amplitude); // Cap amplitude to half the height
+    const segmentWidth = width / segments;
+    let path = `M0,${height / 2}`; // Start in the middle of the left edge
+
+    // Loop through each segment and alternate the y position to create waves
+    for (let i = 1; i <= segments; i++) {
+      const x = i * segmentWidth;
+      const y = height / 2 + (i % 2 === 0 ? clampedAmplitude : -clampedAmplitude);
+      path += ` Q${x - segmentWidth / 2},${y} ${x},${height / 2}`;
+    }
+
+    return path;
+  };
+
+  return (
+    <svg width={width} height={height} viewBox={`0 0 ${width} ${height}`} xmlns="http://www.w3.org/2000/svg">
+      <path d={generatePath()} fill="none" stroke={stroke} strokeWidth={strokeWidth} />
+    </svg>
+  );
+};
+
+export default WavyLine;

invokeai/frontend/web/src/features/controlLayers/components/CanvasLayersPanelContent.tsx

@@ -7,6 +7,8 @@ import { EntityListSelectedEntityActionBar } from 'features/controlLayers/compon
 import { selectHasEntities } from 'features/controlLayers/store/selectors';
 import { memo, useRef } from 'react';
 
+import { ParamDenoisingStrength } from './ParamDenoisingStrength';
+
 export const CanvasLayersPanelContent = memo(() => {
   const hasEntities = useAppSelector(selectHasEntities);
   const layersPanelFocusRef = useRef<HTMLDivElement>(null);
@@ -16,6 +18,8 @@ export const CanvasLayersPanelContent = memo(() => {
     <Flex ref={layersPanelFocusRef} flexDir="column" gap={2} w="full" h="full">
       <EntityListSelectedEntityActionBar />
       <Divider py={0} />
+      <ParamDenoisingStrength />
+      <Divider py={0} />
       {!hasEntities && <CanvasAddEntityButtons />}
       {hasEntities && <CanvasEntityList />}
     </Flex>

invokeai/frontend/web/src/features/controlLayers/components/ParamDenoisingStrength.tsx

@@ -0,0 +1,82 @@
+import {
+  Badge,
+  CompositeNumberInput,
+  CompositeSlider,
+  Flex,
+  FormControl,
+  FormLabel,
+  useToken,
+} from '@invoke-ai/ui-library';
+import { createSelector } from '@reduxjs/toolkit';
+import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
+import WavyLine from 'common/components/WavyLine';
+import { selectImg2imgStrength, setImg2imgStrength } from 'features/controlLayers/store/paramsSlice';
+import { selectActiveRasterLayerEntities } from 'features/controlLayers/store/selectors';
+import { selectImg2imgStrengthConfig } from 'features/system/store/configSlice';
+import { memo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+const selectIsEnabled = createSelector(selectActiveRasterLayerEntities, (entities) => entities.length > 0);
+
+export const ParamDenoisingStrength = memo(() => {
+  const img2imgStrength = useAppSelector(selectImg2imgStrength);
+  const dispatch = useAppDispatch();
+  const isEnabled = useAppSelector(selectIsEnabled);
+
+  const onChange = useCallback(
+    (v: number) => {
+      dispatch(setImg2imgStrength(v));
+    },
+    [dispatch]
+  );
+
+  const config = useAppSelector(selectImg2imgStrengthConfig);
+  const { t } = useTranslation();
+
+  const [invokeBlue300] = useToken('colors', ['invokeBlue.300']);
+
+  return (
+    <FormControl isDisabled={!isEnabled} p={1} justifyContent="space-between" h={8}>
+      <Flex gap={3} alignItems="center">
+        <InformationalPopover feature="paramDenoisingStrength">
+          <FormLabel mr={0}>{`${t('parameters.denoisingStrength')}`}</FormLabel>
+        </InformationalPopover>
+        {isEnabled && (
+          <WavyLine amplitude={img2imgStrength * 10} stroke={invokeBlue300} strokeWidth={1} width={40} height={14} />
+        )}
+      </Flex>
+      {isEnabled ? (
+        <>
+          <CompositeSlider
+            step={config.coarseStep}
+            fineStep={config.fineStep}
+            min={config.sliderMin}
+            max={config.sliderMax}
+            defaultValue={config.initial}
+            onChange={onChange}
+            value={img2imgStrength}
+          />
+          <CompositeNumberInput
+            step={config.coarseStep}
+            fineStep={config.fineStep}
+            min={config.numberInputMin}
+            max={config.numberInputMax}
+            defaultValue={config.initial}
+            onChange={onChange}
+            value={img2imgStrength}
+            variant="outline"
+          />
+        </>
+      ) : (
+        <Flex alignItems="center">
+          <Badge opacity="0.6">
+            {t('common.disabled')} - {t('parameters.noRasterLayers')}
+          </Badge>
+        </Flex>
+      )}
+    </FormControl>
+  );
+});
+
+ParamDenoisingStrength.displayName = 'ParamDenoisingStrength';

invokeai/frontend/web/src/features/settingsAccordions/components/ImageSettingsAccordion/ImageSettingsAccordion.tsx

@@ -10,7 +10,6 @@ import BboxScaledHeight from 'features/parameters/components/Bbox/BboxScaledHeig
 import BboxScaledWidth from 'features/parameters/components/Bbox/BboxScaledWidth';
 import BboxScaleMethod from 'features/parameters/components/Bbox/BboxScaleMethod';
 import { BboxSettings } from 'features/parameters/components/Bbox/BboxSettings';
-import { ParamDenoisingStrength } from 'features/parameters/components/Core/ParamDenoisingStrength';
 import { ParamSeedNumberInput } from 'features/parameters/components/Seed/ParamSeedNumberInput';
 import { ParamSeedRandomize } from 'features/parameters/components/Seed/ParamSeedRandomize';
 import { ParamSeedShuffle } from 'features/parameters/components/Seed/ParamSeedShuffle';
@@ -76,7 +75,6 @@ export const ImageSettingsAccordion = memo(() => {
           <ParamSeedShuffle />
           <ParamSeedRandomize />
         </Flex>
-        <ParamDenoisingStrength />
         <Expander label={t('accordions.advanced.options')} isOpen={isOpenExpander} onToggle={onToggleExpander}>
           <Flex gap={4} pb={4} flexDir="column">
             {isFLUX && <ParamOptimizedDenoisingToggle />}