implementation

ai-cfia · Jun 4, 2024 · e2254cc · e2254cc
1 parent 35e5c68
commit e2254cc
Show file tree

Hide file tree

Showing 9 changed files with 199 additions and 114 deletions.
diff --git a/src/common/cacheutils.ts b/src/common/cacheutils.ts
@@ -371,6 +371,7 @@ export const loadResultsToCache = (
         ...box.box,
         inferenceId: inferenceData.inferenceId,
         boxId: box.boxId,
+        classId: box.classId,
         label: box.label,
       };
     }),

diff --git a/src/common/imageutils.ts b/src/common/imageutils.ts
@@ -1,14 +1,11 @@
+import { BoxCSS, BoxCoordinates } from "./types";
+
 export const getScaledBounds = (
   containerWidth: number,
   containerHeight: number,
   itemWidth: number,
   itemHeight: number,
-  box: {
-    topX: number;
-    topY: number;
-    bottomX: number;
-    bottomY: number;
-  },
+  box: BoxCoordinates,
 ): {
   scaledWidth: number;
   scaledHeight: number;
@@ -28,3 +25,24 @@ export const getScaledBounds = (
     scaledTopY,
   };
 };
+
+export const getUnscaledCoordinates = (
+  containerWidth: number,
+  containerHeight: number,
+  itemWidth: number,
+  itemHeight: number,
+  box: BoxCSS,
+): BoxCoordinates => {
+  const scaleFactorWidth = itemWidth / containerWidth;
+  const scaleFactorHeight = itemHeight / containerHeight;
+  const topX = box.left * scaleFactorWidth;
+  const topY = box.top * scaleFactorHeight;
+  const bottomX = box.left + box.minWidth * scaleFactorWidth;
+  const bottomY = box.top + box.minHeight * scaleFactorHeight;
+  return {
+    topX,
+    topY,
+    bottomX,
+    bottomY,
+  };
+};
diff --git a/src/common/tests/loadresultstocache.test.ts b/src/common/tests/loadresultstocache.test.ts
@@ -20,10 +20,12 @@ describe("loadResultsToCache", () => {
 
   let inferenceData: ApiInferenceData = {
     filename: "test",
+    imageId: "test",
     inferenceId: "test",
     boxes: [
       {
         score: 0.1,
+        classId: "0",
         label: "a",
         boxId: "0",
         box: {
@@ -38,6 +40,7 @@ describe("loadResultsToCache", () => {
       },
       {
         score: 0.2,
+        classId: "1",
         label: "b",
         boxId: "1",
         box: {
@@ -52,6 +55,7 @@ describe("loadResultsToCache", () => {
       },
       {
         score: 0.3,
+        classId: "2",
         label: "c",
         boxId: "2",
         box: {
@@ -87,10 +91,12 @@ describe("loadResultsToCache", () => {
 
     inferenceData = {
       filename: "test",
+      imageId: "test",
       inferenceId: "test",
       boxes: [
         {
           score: 0.1,
+          classId: "0",
           label: "a",
           boxId: "0",
           box: {
@@ -105,6 +111,7 @@ describe("loadResultsToCache", () => {
         },
         {
           score: 0.2,
+          classId: "1",
           label: "b",
           boxId: "1",
           box: {
@@ -119,6 +126,7 @@ describe("loadResultsToCache", () => {
         },
         {
           score: 0.3,
+          classId: "2",
           label: "c",
           boxId: "2",
           box: {

diff --git a/src/common/types.d.ts b/src/common/types.d.ts
@@ -1,10 +1,12 @@
 export interface ApiInferenceData {
   filename: string;
+  imageId: string;
   inferenceId: string;
   boxes: Array<{
     topN: Array<{ score: number; label: string }>;
     score: number;
     label: string;
+    classId: string;
     boxId: string;
     box: BoxCoordinates;
     overlapping: boolean;
@@ -39,6 +41,7 @@ export interface BoxCoordinates {
 export interface InferenceBox extends BoxCoordinates {
   inferenceId: string;
   boxId: string;
+  classId: string;
   label: string;
 }
 
@@ -65,6 +68,7 @@ export interface FeedbackDataPositive extends FeedbackData {
 export interface FeedbackDataNegative extends FeedbackData {
   boxes: Array<{
     label: string;
+    classId: string;
     boxId: string;
     box: BoxCoordinates;
     comment: string;
@@ -76,8 +80,14 @@ export interface LabelOccurrences {
 }
 
 // TODO: Redefine when the backend is updated
-interface SpeciesData {
+interface ClassData {
   id: number;
+  classId: string;
+  label: string;
+}
+
+interface ApiSpeciesData {
+  classId: string;
   label: string;
 }