Skip to content

Commit b6ca5ce

Browse files
committed
checkpoint, seve and tamay
1 parent c36ce81 commit b6ca5ce

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@semantic-release/git": "^9.0.0",
1111
"get-image-data": "^3.0.1",
1212
"material-survey": "^1.0.34",
13-
"mmgc1-cpp": "^1.0.2",
13+
"mmgc1-cpp": "^1.0.6",
1414
"moment": "^2.23.0",
1515
"react-full-screen": "^0.2.4",
1616
"react-hotkeys": "^2.0.0",

src/ImageMask/index.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default ({
1717
}) => {
1818
const [canvasRef, setCanvasRef] = useState(null)
1919

20-
const lastTimeMMGCRun = useRef(Date.now());
20+
const lastTimeMMGCRun = useRef(0);
2121
const superPixelsGenerated = useRef(false)
2222
const [sampleImageData, setSampleImageData] = useState()
2323

@@ -43,7 +43,9 @@ export default ({
4343
if (!canvasRef) return
4444
if (!sampleImageData) return
4545
if (!mmgc.setImage) return
46-
if (Date.now() < lastTimeMMGCRun.current + 5000) return
46+
// NEEDS DEBOUNCE
47+
if (Date.now() < lastTimeMMGCRun.current + 500) return
48+
lastTimeMMGCRun.current = Date.now()
4749
const context = canvasRef.getContext("2d")
4850

4951
console.log("got the sample image data and ready to mmgc!")
@@ -72,24 +74,29 @@ export default ({
7274
mmgc.addClassPoint(regionClsList.indexOf(classPoint.cls), Math.floor(
7375
classPoint.y * sampleImageData.height
7476
), Math.floor(classPoint.x * sampleImageData.width
75-
))
77+
))
7678
}
7779
// mmgc.addClassPoint(0, 100, 125)
7880
// mmgc.addClassPoint(1, 10, 10)
7981
// mmgc.addClassPoint(1, 240, 300)
8082
mmgc.computeMasks()
8183
const maskAddress = mmgc.getColoredMask()
82-
const cppImDataUint8 = new Uint8ClampedArray(
84+
const cppImDataUint8 = new Uint8Array(
8385
mmgc.HEAPU8.buffer,
8486
maskAddress,
85-
sampleImageData.width * sampleImageData.height * 4
87+
sampleImageData.data.length
88+
// sampleImageData.width * sampleImageData.height * 4
8689
)
90+
const clampedArray = Uint8ClampedArray.from(cppImDataUint8)
8791

88-
const maskImageData = new ImageData(cppImDataUint8, sampleImageData.width, sampleImageData.height)
92+
window.uint8Arrays = (window.uint8Arrays || []).concat([cppImDataUint8])
93+
94+
const maskImageData = new ImageData(clampedArray, sampleImageData.width, sampleImageData.height)
8995

9096
// for (const i = 0; i < cppImDataUint8.length;i++){
9197
// sampleImageData.data[i] = cppImDataUint8[i]
9298
// }
99+
console.log(maskImageData.data)
93100
context.clearRect(0,0,sampleImageData.width, sampleImageData.height)
94101
context.putImageData(maskImageData, 0, 0)
95102
}, [canvasRef, sampleImageData, JSON.stringify(classPoints.map(c => [c.x, c.y, c.cls]))])

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10820,10 +10820,10 @@ mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@
1082010820
dependencies:
1082110821
minimist "0.0.8"
1082210822

10823-
mmgc1-cpp@^1.0.2:
10824-
version "1.0.2"
10825-
resolved "https://registry.yarnpkg.com/mmgc1-cpp/-/mmgc1-cpp-1.0.2.tgz#6bf7d8c322a094181f1258ad98a5d3cc2355afa9"
10826-
integrity sha512-UQ0xUJx0L4LVy5H6tQwDLswiLrMXnsrUAo1Fd2sFHlBuNwW+x5xV+ZA+MW3yAoRXJcut5bXJ5MsVOd7dzr5ucA==
10823+
mmgc1-cpp@^1.0.6:
10824+
version "1.0.6"
10825+
resolved "https://registry.yarnpkg.com/mmgc1-cpp/-/mmgc1-cpp-1.0.6.tgz#4c3623e984ebf2db8c543e961ac8793f5eb5dcd1"
10826+
integrity sha512-lSvSxKCmdudBlZWf7DT6Op09wh5yn6ugd/M0695Jfw4Bka63HhEgESz9K5KVA1/u0AumnPbHV1ZOuSqySY5WGw==
1082710827

1082810828
moment@^2.23.0:
1082910829
version "2.24.0"

0 commit comments

Comments
 (0)