:chore: Get rid of duplicate utils (#515)

Author: jpggvilaca

web_ui/packages/smart-tools/index.ts

@@ -2,5 +2,8 @@
 // LIMITED EDGE SOFTWARE DISTRIBUTION LICENSE
 
 export { default as OpenCVLoader } from './src/utils/opencv-loader';
+
 export { Watershed } from './src/watershed/watershed';
 export { type WatershedInstance, type WatershedPolygon } from './src/watershed/interfaces';
+
+export { formatContourToPoints, approximateShape } from './src/utils/utils';

web_ui/src/pages/annotator/tools/segment-anything-tool/model/post-processing.ts

@@ -1,11 +1,11 @@
 // Copyright (C) 2022-2025 Intel Corporation
 // LIMITED EDGE SOFTWARE DISTRIBUTION LICENSE
 
+import { approximateShape } from '@geti/smart-tools';
 import type cv from 'OpenCVTypes';
 
 import { Circle, Point, Polygon, Rect, RotatedRect, Shape } from '../../../../../core/annotations/shapes.interface';
 import { ShapeType } from '../../../../../core/annotations/shapetype.enum';
-import { approximateShape } from '../../../../../webworkers/utils';
 import type { SegmentAnythingResult } from './segment-anything-result';
 
 interface PostProcessorConfig {

web_ui/src/webworkers/grabcut.worker.ts

@@ -3,15 +3,15 @@
 
 //  Dependencies get bundled into the worker
 
-import { OpenCVLoader } from '@geti/smart-tools';
+import { approximateShape, OpenCVLoader } from '@geti/smart-tools';
 import { expose } from 'comlink';
 import type OpenCVTypes from 'OpenCVTypes';
 
 import { Point, Polygon, Rect } from '../core/annotations/shapes.interface';
 import { ShapeType } from '../core/annotations/shapetype.enum';
 import { GrabcutToolType } from '../pages/annotator/tools/grabcut-tool/grabcut-tool.enums';
 import { GrabcutData } from '../pages/annotator/tools/grabcut-tool/grabcut-tool.interface';
-import { approximateShape, getMatFromPoints, getPointsFromMat } from './utils';
+import { getMatFromPoints, getPointsFromMat } from './utils';
 
 declare const self: DedicatedWorkerGlobalScope;
 

web_ui/src/webworkers/ritm.worker.ts

@@ -3,7 +3,7 @@
 
 // Dependencies get bundled into the worker
 
-import { OpenCVLoader } from '@geti/smart-tools';
+import { approximateShape, OpenCVLoader } from '@geti/smart-tools';
 import { expose } from 'comlink';
 import ndarray from 'ndarray';
 import ops from 'ndarray-ops';
@@ -21,7 +21,7 @@ import {
 } from '../pages/annotator/tools/ritm-tool/ritm-tool.interface';
 import { isPolygonValid } from '../pages/annotator/tools/utils';
 import { sessionParams } from '../pages/annotator/tools/wasm-utils';
-import { approximateShape, concatFloat32Arrays, loadSource, stackPlanes } from './utils';
+import { concatFloat32Arrays, loadSource, stackPlanes } from './utils';
 
 declare const self: DedicatedWorkerGlobalScope;
 

web_ui/src/webworkers/utils.ts

@@ -1,33 +1,12 @@
 // Copyright (C) 2022-2025 Intel Corporation
 // LIMITED EDGE SOFTWARE DISTRIBUTION LICENSE
 
+import { approximateShape } from '@geti/smart-tools';
 import axios from 'axios';
 import type OpenCVTypes from 'OpenCVTypes';
 
 import { Point } from '../core/annotations/shapes.interface';
 
-export const formatContourToPoints = (
-    mask: OpenCVTypes.Mat,
-    contour: OpenCVTypes.Mat,
-    width: number,
-    height: number
-): Point[] => {
-    const points: Point[] = [];
-
-    if (!contour?.rows) {
-        return points;
-    }
-
-    for (let row = 0; row < contour.rows; row++) {
-        points.push({
-            x: (contour.intAt(row, 0) / mask.cols) * width,
-            y: (contour.intAt(row, 1) / mask.rows) * height,
-        });
-    }
-
-    return points;
-};
-
 export const isPointOutsideOfBounds = (limit: OpenCVTypes.Rect, point: OpenCVTypes.Point | Point): boolean =>
     point.x <= limit.x || point.x >= limit.width || point.y <= limit.y || point.y >= limit.height;
 
@@ -42,16 +21,6 @@ export const optimizePolygonAndCV = (CV: OpenCVTypes.cv, points: Point[], isClos
     return newPoints;
 };
 
-//It approximates a contour shape to another shape with less number of vertices
-export const approximateShape = (CV: OpenCVTypes.cv, contour: OpenCVTypes.Mat, isClose = true): OpenCVTypes.Mat => {
-    const epsilon = 1.0;
-    const newContour = new CV.Mat();
-
-    CV.approxPolyDP(contour, newContour, epsilon, isClose);
-
-    return newContour;
-};
-
 export const getMatFromPoints = (CV: OpenCVTypes.cv, points: Point[], offset = { x: 0, y: 0 }): OpenCVTypes.Mat => {
     const pointsMat = new CV.Mat(points.length, 1, CV.CV_32SC2);