Add new OpenCV functions

France-ioi · Oct 16, 2024 · 8f6ff8e · 8f6ff8e
1 parent 31616ca
commit 8f6ff8e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/frontend/stepper/quickalgo_executor.ts b/frontend/stepper/quickalgo_executor.ts
@@ -249,11 +249,11 @@ class QuickalgoExecutor {
 
         const libraryCallResult = await this.makeTimedLibraryCall(context, module, action, args);
 
-        const libraryCall: QuickalgoLibraryCall = {
+        const libraryCall: QuickalgoLibraryCall = JSON.parse(JSON.stringify({
             module,
             action,
             args,
-        };
+        }));
 
         await this.stepperContext.dispatch(stepperRecordLibraryCall(libraryCall, libraryCallResult));
 

diff --git a/frontend/task/fixtures/test_opencv/index.ts b/frontend/task/fixtures/test_opencv/index.ts
@@ -10,7 +10,7 @@ export default {
         includeBlocks: {
             groupByCategory: false,
             generatedBlocks: {
-                opencv: ["imread", "cvtColor", "imwrite"]
+                opencv: ["imread", "cvtColor", "flip", "rotate", "blur", "resize", "Canny", "imwrite"]
             },
             standardBlocks: {
                 includeAll: false,

diff --git a/frontend/task/libs/opencv/opencv_lib.tsx b/frontend/task/libs/opencv/opencv_lib.tsx
@@ -5,6 +5,11 @@ const localLanguageStrings = {
         description: {
             imread: "imread(image) ouvre l'image",
             cvtColor: "cvtColor(image, couleur) convertit l'image dans la couleur fournie",
+            flip: "flip(image, flipCode) renverse l'image dans la direction choisie",
+            resize: "resize(image, newSize) redimensionne l'image",
+            blur: "blur(image, kernelSize) applique un flou sur l'image",
+            rotate: "rotate(image, rotateCode) fait pivoter l'image",
+            Canny: "Canny(image, threshold1, threshold2) détecte les contours sur une image",
             imwrite: "imwrite(fichier, image) enregistre l'image",
         },
     },
@@ -22,22 +27,46 @@ export class OpenCvLib extends QuickAlgoLibrary {
 
         this.setLocalLanguageStrings(localLanguageStrings);
 
-        this.opencv = {
-            imread: this.generateRemoteHandler('opencv', 'imread'),
-            cvtColor: this.generateRemoteHandler('opencv', 'cvtColor'),
-            imwrite: this.generateRemoteHandler('opencv', 'imwrite'),
-        };
+        const blocksList = [
+            'imread',
+            'cvtColor',
+            'flip',
+            'resize',
+            'blur',
+            'rotate',
+            'Canny',
+            'imwrite',
+        ];
+
+        this.opencv = {};
+        for (let block of blocksList) {
+            this.opencv[block] = this.generateRemoteHandler('opencv', block);
+        }
 
         this.customBlocks = {
             opencv: {
                 opencv: [
                     { name: "imread", params: ["String"], yieldsValue: 'image'},
                     { name: "cvtColor", params: ["Image", "String"], yieldsValue: 'image'},
+                    { name: "flip", params: ["Image", "String"], yieldsValue: 'image'},
+                    { name: "resize", params: ["Image", null], yieldsValue: 'image'},
+                    { name: "blur", params: ["Image", null], yieldsValue: 'image'},
+                    { name: "rotate", params: ["Image", "String"], yieldsValue: 'image'},
+                    { name: "Canny", params: ["Image", "Number", "Number"], yieldsValue: 'image'},
                     { name: "imwrite", params: ["String", "Image"]},
                 ],
             }
         };
 
+        this.customConstants = {
+            opencv: [
+                {name: 'COLOR_BGR2GRAY', value: 6},
+                {name: 'ROTATE_90_CLOCKWISE', value: 0},
+                {name: 'ROTATE_180', value: 1},
+                {name: 'ROTATE_90_COUNTERCLOCKWISE', value: 2},
+            ],
+        };
+
         this.innerState = {
         };
     }