test(alignDifferentSize): works with id crops

opatiny · opatiny · commit fa6ca72b81d5 · 2024-01-19T11:26:54.000+01:00
diff --git a/src/operations/paintMaskOnImage.ts b/src/operations/paintMaskOnImage.ts
@@ -29,7 +29,7 @@ export interface PaintMaskOnImageOptions {
 }
 
 /**
- * Paint a mask onto an image and the given position and with the given color.
+ * Paint a mask onto an image at the given position and with the given color.
  * @param image - Image on which to paint the mask.
  * @param mask - Mask to paint on the image.
  * @param options - Paint mask options.
diff --git a/src/stack/align/__tests__/__image_snapshots__/align-different-size-test-ts-id-crops-1-snap.png b/src/stack/align/__tests__/__image_snapshots__/align-different-size-test-ts-id-crops-1-snap.png
diff --git a/src/stack/align/__tests__/alignDifferentSize.test.ts b/src/stack/align/__tests__/alignDifferentSize.test.ts
@@ -0,0 +1,15 @@
+import { overlapImages } from '../../../featureMatching';
+import { alignDifferentSize } from '../alignDifferentSize';
+
+test('id crops', () => {
+  const destination = testUtils.load('align/cropped.png').grey();
+  const source = testUtils.load('align/croppedRef.png').grey();
+
+  const result = alignDifferentSize(source, destination, {
+    maxNbOperations: 1e8,
+  });
+
+  const overlap = overlapImages(source, destination, { origin: result });
+
+  expect(overlap).toMatchImageSnapshot();
+});
diff --git a/src/stack/align/alignDifferentSize.ts b/src/stack/align/alignDifferentSize.ts
@@ -36,6 +36,11 @@ export interface AlignDifferentSizeOptions extends ComputeNbOperationsOptions {
    * @default 'minMax'
    */
   level?: LevelingAlgorithm;
+  /**
+   * Kernel size for the blur applied to the images before the rough alignment phase.
+   * @default 3
+   */
+  blurKernelSize?: number;
 }
 
 /**
@@ -48,7 +53,7 @@ export interface AlignDifferentSizeOptions extends ComputeNbOperationsOptions {
 export function alignDifferentSize(
   source: Image,
   destination: Image,
-  options: AlignDifferentSizeOptions,
+  options: AlignDifferentSizeOptions = {},
 ): Point {
   const {
     xFactor = 0.5,
@@ -57,6 +62,7 @@ export function alignDifferentSize(
     precisionFactor = 1.5,
     thresholdAlgoritm = 'otsu',
     level = 'minMax',
+    blurKernelSize,
   } = options;
 
   const margins = computeXYMargins(source, destination, { xFactor, yFactor });
@@ -72,11 +78,13 @@ export function alignDifferentSize(
   const smallSource = prepareForAlign(source, {
     scalingFactor,
     level,
+    blurKernelSize,
   });
   const smallMask = getAlignMask(smallSource, thresholdAlgoritm);
   const smallDestination = prepareForAlign(destination, {
     scalingFactor,
     level,
+    blurKernelSize,
   });
   const smallMargins = computeXYMargins(smallSource, smallDestination);
 
@@ -91,27 +99,32 @@ export function alignDifferentSize(
   );
 
   // Find overlapping surface and source and destination origins
-  const minX = Math.min(0, roughTranslation.column);
+  const scaledTranslation = {
+    column: Math.round(roughTranslation.column * scalingFactor),
+    row: Math.round(roughTranslation.row * scalingFactor),
+  };
+
+  const minX = Math.max(0, scaledTranslation.column);
   const maxX = Math.min(
     destination.width,
-    source.width + roughTranslation.column,
+    source.width + scaledTranslation.column,
   );
-  const minY = Math.min(0, roughTranslation.row);
+  const minY = Math.max(0, scaledTranslation.row);
   const maxY = Math.min(
     destination.height,
-    source.height + roughTranslation.row,
+    source.height + scaledTranslation.row,
   );
 
   const overlapWidth = maxX - minX;
   const overlapHeight = maxY - minY;
 
   const sourceOrigin = {
-    column: Math.max(0, -roughTranslation.column),
-    row: Math.max(0, -roughTranslation.row),
+    column: Math.max(0, -scaledTranslation.column),
+    row: Math.max(0, -scaledTranslation.row),
   };
   const destinationOrigin = {
-    column: Math.max(0, roughTranslation.column),
-    row: Math.max(0, roughTranslation.row),
+    column: Math.max(0, scaledTranslation.column),
+    row: Math.max(0, scaledTranslation.row),
   };
 
   // Precise alignment
@@ -126,19 +139,25 @@ export function alignDifferentSize(
     height: overlapHeight,
   });
 
-  const preciseMargins = precisionFactor * scalingFactor;
+  const preciseSource = prepareForAlign(sourceCrop, { level, blurKernelSize });
+  const preciseDestination = prepareForAlign(destinationCrop, {
+    level,
+    blurKernelSize,
+  });
+
+  const preciseMargins = Math.round(precisionFactor * scalingFactor);
 
   const preciseTranslation = getMinDiffTranslation(
-    sourceCrop,
-    destinationCrop,
+    preciseSource,
+    preciseDestination,
     {
       leftRightMargin: preciseMargins,
       topBottomMargin: preciseMargins,
     },
   );
 
   return {
-    column: roughTranslation.column + preciseTranslation.column,
-    row: roughTranslation.row + preciseTranslation.row,
+    column: scaledTranslation.column + preciseTranslation.column,
+    row: scaledTranslation.row + preciseTranslation.row,
   };
 }
diff --git a/src/stack/align/computeNbOperations.ts b/src/stack/align/computeNbOperations.ts
@@ -53,7 +53,7 @@ export function computeXYMargins(
   if (source.height < destination.height) {
     yMargin = Math.round(yFactor * source.height);
   } else {
-    yMargin = source.height - destination.height * (1 - yFactor);
+    yMargin = Math.round(source.height - destination.height * (1 - yFactor));
   }
   return { xMargin, yMargin };
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export interface PaintMaskOnImageOptions {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * Paint a mask onto an image and the given position and with the given color.`
	`32`	`+ * Paint a mask onto an image at the given position and with the given color.`
`33`	`33`	`* @param image - Image on which to paint the mask.`
`34`	`34`	`* @param mask - Mask to paint on the image.`
`35`	`35`	`* @param options - Paint mask options.`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export function computeXYMargins(`
`53`	`53`	`if (source.height < destination.height) {`
`54`	`54`	`yMargin = Math.round(yFactor * source.height);`
`55`	`55`	`} else {`
`56`		`- yMargin = source.height - destination.height * (1 - yFactor);`
	`56`	`+ yMargin = Math.round(source.height - destination.height * (1 - yFactor));`
`57`	`57`	`}`
`58`	`58`	`return { xMargin, yMargin };`
`59`	`59`	`}`