Merge pull request #56 from waoai/feat/fs

Full Segmentation (MVP)

Author: seveibar

.gitignore

@@ -24,3 +24,7 @@ yarn-error.log*
 storybook-static
 
 dist
+
+secret.*
+secret.story.*
+*.secret.*

package-lock.json

@@ -1,15 +1,17 @@
 {
   "name": "react-image-annotate",
-  "version": "1.0.15",
+  "version": "1.2.2",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.12",
     "@fortawesome/free-solid-svg-icons": "^5.6.3",
     "@fortawesome/react-fontawesome": "^0.1.3",
     "@material-ui/core": "^4.6.0",
     "@material-ui/icons": "^4.9.1",
     "@semantic-release/git": "^9.0.0",
+    "color-alpha": "^1.0.4",
     "get-image-data": "^3.0.1",
     "material-survey": "^1.0.34",
+    "mmgc1-cpp": "^1.0.44",
     "moment": "^2.23.0",
     "react-full-screen": "^0.2.4",
     "react-hotkeys": "^2.0.0",
@@ -22,6 +24,7 @@
     "react-use": "^13.27.0",
     "react-use-measure": "^2.0.0",
     "seamless-immutable": "^7.1.4",
+    "shallow-equal": "^1.2.1",
     "storybook": "^5.3.14",
     "transformation-matrix-js": "^2.7.6",
     "use-event-callback": "^0.1.0",

package.json

@@ -41,6 +41,7 @@ type Props = {
   videoSrc?: string,
   keyframes?: Object,
   videoName?: string,
+  fullImageSegmentationMode?: boolean,
 }
 
 export const Annotator = ({
@@ -50,14 +51,22 @@ export const Annotator = ({
   showPointDistances,
   pointDistancePrecision,
   showTags = true,
-  enabledTools = ["select", "create-point", "create-box", "create-polygon"],
+  enabledTools = [
+    "select",
+    "create-point",
+    "create-box",
+    "create-polygon",
+    "create-expanding-line",
+    "show-mask",
+  ],
   selectedTool = "select",
   regionTagList = [],
   regionClsList = [],
   imageTagList = [],
   imageClsList = [],
   keyframes = {},
   taskDescription,
+  fullImageSegmentationMode = false,
   RegionEditLabel,
   videoSrc,
   videoTime = 0,
@@ -83,8 +92,10 @@ export const Annotator = ({
       showPointDistances,
       pointDistancePrecision,
       selectedTool,
+      fullImageSegmentationMode: fullImageSegmentationMode,
       mode: null,
       taskDescription,
+      showMask: true,
       labelImages: imageClsList.length > 0 || imageTagList.length > 0,
       regionClsList,
       regionTagList,

src/Annotator/index.js

@@ -0,0 +1,53 @@
+// @flow
+
+function clamp(num, min, max) {
+  return num <= min ? min : num >= max ? max : num
+}
+
+export default (expandingLine) => {
+  const expandingWidth = expandingLine.expandingWidth || 0.005
+  const pointPairs = expandingLine.points.map(({ x, y, angle, width }, i) => {
+    if (!angle) {
+      const n =
+        expandingLine.points[clamp(i + 1, 0, expandingLine.points.length - 1)]
+      const p =
+        expandingLine.points[clamp(i - 1, 0, expandingLine.points.length - 1)]
+      angle = Math.atan2(p.x - n.x, p.y - n.y) + Math.PI / 2
+    }
+    const dx = (Math.sin(angle) * (width || expandingWidth)) / 2
+    const dy = (Math.cos(angle) * (width || expandingWidth)) / 2
+    return [
+      { x: x + dx, y: y + dy },
+      { x: x - dx, y: y - dy },
+    ]
+  })
+  const firstSection = pointPairs.map(([p1, p2]) => p1)
+  const secondSection = pointPairs.map(([p1, p2]) => p2).asMutable()
+  secondSection.reverse()
+
+  const newPoints = firstSection.concat(secondSection).map(({ x, y }) => [x, y])
+
+  return {
+    ...expandingLine,
+    type: "polygon",
+    open: false,
+    points: newPoints,
+    unfinished: undefined,
+    candidatePoint: undefined,
+  }
+
+  // let { expandingWidth = 0.005, points } = region
+  // expandingWidth = points.slice(-1)[0].width || expandingWidth
+  // const lastPoint = points.slice(-1)[0]
+  // return (
+  //   <>
+  //     <polygon
+  //       points={
+  //         .map((p) => `${p.x * iw} ${p.y * ih}`)
+  //         .join(" ")}
+  // return {
+  //   ...expandingLine,
+  //   unfinished: undefined,
+  //   candidatePoint: undefined,
+  // }
+}

src/Annotator/reducers/convert-expanding-line-to-polygon.js

@@ -0,0 +1,6 @@
+// @flow
+
+export default (pointsWithAngles) => {
+  // Adjacent angles should not have an angular distance of more than Math.PI
+  return pointsWithAngles
+}