fix: LEAP-439: Add maskData exporting into new MIG serialization appr…

…oach (#5246) * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7413835114 * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7414040859 * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7415324369 * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7415843866 * [submodules] Copy src HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466346141 * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466346141 * [submodules] Copy src HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466386615 * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466386615 * ci: Build frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466431342 * [submodules] Copy src HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466931328 * [submodules] Build static HumanSignal/label-studio-frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7466931328 --------- Co-authored-by: Sergey <gondragos@gmail.com> Co-authored-by: robot-ci-heartex <robot-ci-heartex@users.noreply.github.com> Co-authored-by: Sergey <sergey.koshevarov@heartex.com>
HumanSignal · Jan 9, 2024 · b6da213 · b6da213
1 parent d0c03ce
commit b6da213
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/label_studio/frontend/dist/lsf/js/main.js b/label_studio/frontend/dist/lsf/js/main.js
diff --git a/label_studio/frontend/dist/lsf/js/main.js.map b/label_studio/frontend/dist/lsf/js/main.js.map
diff --git a/label_studio/frontend/dist/lsf/version.json b/label_studio/frontend/dist/lsf/version.json
@@ -1,6 +1,6 @@
 {
-  "message": "fix: LEAP-461: Fix displaying conditions for comments tab",
-  "commit": "083812f3291b4b85845841e4ca58126e6d12e50e",
+  "message": "fix: LEAP-439: Add maskData exporting into new MIG serialization approach",
+  "commit": "a3e4f43f823890cbc40f712634defbff003124dd",
   "branch": "master",
-  "date": "2024-01-09T18:54:17Z"
+  "date": "2024-01-09T21:10:34Z"
 }
diff --git a/web/dist/libs/editor/main.js b/web/dist/libs/editor/main.js
diff --git a/web/dist/libs/editor/main.js.map b/web/dist/libs/editor/main.js.map
diff --git a/web/libs/editor/src/components/AnnotationTab/AnnotationTab.js b/web/libs/editor/src/components/AnnotationTab/AnnotationTab.js
@@ -54,6 +54,7 @@ export const AnnotationTab = observer(({ store }) => {
 
           <Elem name="content">
             <Comments
+              annotationStore={as}
               commentStore={store.commentStore}
               cacheKey={`task.${store.task.id}`}
             />

diff --git a/web/libs/editor/src/regions/BrushRegion.js b/web/libs/editor/src/regions/BrushRegion.js
@@ -228,19 +228,24 @@ const Model = types
     let pathPoints,
       cachedPoints,
       lastPointX = -1,
-      lastPointY = -1;
+      lastPointY = -1,
+      maskImage;
 
     return {
       afterCreate() {
-        // if ()
-        // const newdata = ctx.createImageData(750, 937);
-        // newdata.data.set(decode(item._rle));
-        // const dec = decode(self._rle);
-        // self._rle_image =
-        // item._cached_mask = decode(item._rle);
-        // const newdata = ctx.createImageData(750, 937);
-        //     newdata.data.set(item._cached_mask);
-        //     var img = imagedata_to_image(newdata);
+        self.updateMaskImage();
+      },
+
+      updateMaskImage() {
+        if (self.maskDataURL) {
+          if (!maskImage) maskImage = new window.Image();
+
+          maskImage.src = self.maskDataURL;
+        }
+      },
+
+      getMaskImage() {
+        return maskImage;
       },
 
       setLayerRef(ref) {
@@ -349,6 +354,7 @@ const Model = types
         annotation.startAutosave();
 
         self.maskDataURL = maskDataURL;
+        self.updateMaskImage();
 
         self.notifyDrawingFinished();
 

diff --git a/web/libs/editor/src/utils/canvas.js b/web/libs/editor/src/utils/canvas.js
@@ -208,6 +208,13 @@ function exportRLE(region) {
     ctx.putImageData(imageData, 0, 0);
   }
 
+  const maskImage = region.getMaskImage?.();
+
+  if (maskImage) {
+    // Apply maskDataURL to existing image data
+    ctx.drawImage(maskImage, 0, 0);
+  }
+
   // If the region was changed manually, we'll have access to user tuoches
   // Render those on the canvas after RLE
   if (region.touches.length > 0) {