minor fixes (#1380)

frzyc · Dec 21, 2023 · 97b8f53 · 97b8f53
1 parent ef91525
commit 97b8f53
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/apps/frontend/src/app/Snow.tsx b/apps/frontend/src/app/Snow.tsx
@@ -3,8 +3,8 @@ import { range } from '@genshin-optimizer/util'
 export default function Snow() {
   return (
     <div id="snowflake-container">
-      {range(1, 200).map(() => (
-        <div className="snowflake" />
+      {range(1, 200).map((i) => (
+        <div key={i} className="snowflake" />
       ))}
     </div>
   )

diff --git a/libs/gi-art-scanner/src/lib/processImg.ts b/libs/gi-art-scanner/src/lib/processImg.ts
@@ -73,7 +73,7 @@ export async function processEntry(
 
   const titleHistogram = findTitle(artifactCardImageData)
   const [titleTop, titleBot] = titleHistogram
-    ? findHistogramRange(titleHistogram)
+    ? findHistogramRange(titleHistogram, 0.7, 1) // smaller threshold
     : [0, 0]
 
   const whiteCardHistogram = histogramContAnalysis(
@@ -261,6 +261,8 @@ export async function processEntry(
     )
   if (debugImgs) {
     debugImgs['bwHeader'] = imageDataToCanvas(bwHeader).toDataURL()
+    debugImgs['greenTextCropped'] =
+      imageDataToCanvas(greenTextCropped).toDataURL()
     debugImgs['bwGreenText'] = imageDataToCanvas(bwGreenText).toDataURL()
     if (bwEquipped)
       debugImgs['bwEquipped'] = imageDataToCanvas(bwEquipped).toDataURL()

diff --git a/libs/img-util/src/imageData.ts b/libs/img-util/src/imageData.ts
@@ -1,3 +1,5 @@
+import { clamp } from '@genshin-optimizer/util'
+
 export function cropCanvas(
   srcCanvas: HTMLCanvasElement,
   x: number,
@@ -23,14 +25,18 @@ export function crop(srcCanvas: HTMLCanvasElement, options: CropOptions) {
   const width = srcCanvas.width
   const height = srcCanvas.height
   let { x1 = 0, x2 = width, y1 = 0, y2 = height } = options
-  if (y1 > y2 || y1 > height) {
+  x1 = clamp(x1, 0, width)
+  x2 = clamp(x2, 0, width)
+  y1 = clamp(y1, 0, height)
+  y2 = clamp(y2, 0, height)
+  if (y1 >= y2) {
     console.warn(
       `trying to crop with y1:${y1} y2:${y2}, with src height ${height}.`
     )
     y1 = 0
     y2 = height
   }
-  if (x1 > x2 || x1 > width) {
+  if (x1 >= x2) {
     console.warn(
       `trying to crop with x1:${x1} x2:${x2}, with src width ${width}.`
     )