3162711586

Build Type

github

Committed by GitHub

Commit Message

Merge b40d1eac9 into 68431bc62

Pull Request Pull Request #384: Fix GPU rendering bugs, cell 0 bugs, and bug in saving raw array

Run Details

321 of 629 branches covered (51.03%)

Branch coverage included in aggregate %.

26 of 33 new or added lines in 5 files covered. (78.79%)

10 existing lines in 1 file now uncovered.

1758 of 2638 relevant lines covered (66.64%)

1610.24 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/frontend/src/Project/Canvas/ToolCanvas/OuterOutlineCanvas.js

import { useSelector } from '@xstate/react';
import { useEffect, useRef } from 'react';
import {
  useAlphaGpu,
  useArrays,
  useCanvas,
  useCellMatrix,
  useImage,
  useLabeled,
} from '../../ProjectContext';

function OuterOutlineCanvas({ setBitmaps, cell, color }) {
  const canvas = useCanvas();
  const width = useSelector(canvas, (state) => state.context.width);
  const height = useSelector(canvas, (state) => state.context.height);

  const labeled = useLabeled();
  const feature = useSelector(labeled, (state) => state.context.feature);

  const image = useImage();
  const t = useSelector(image, (state) => state.context.t);

  const arrays = useArrays();
  const labeledArray = useSelector(
    arrays,
    (state) => state.context.labeled && state.context.labeled[feature][t]
  );

  const cellMatrix = useCellMatrix();

  const gpu = useAlphaGpu();
  const kernelRef = useRef();

  useEffect(() => {
    const kernel = gpu.createKernel(
      `function (data, cells, numValues, cell, color) {
        const x = this.thread.x;
        const y = this.constants.h - 1 - this.thread.y;
        const value = data[y][x];
        let north = 0;
        let south = 0;
        let east = 0;
        let west = 0;
        if (x !== 0) {
          north = data[y][x - 1];
        }
        if (x !== this.constants.w - 1) {
          south = data[y][x + 1];
        }
        if (y !== 0) {
          west = data[y - 1][x];
        }
        if (y !== this.constants.h - 1) {
          east = data[y + 1][x];
        }
        if (cells[value][cell] === 0 && value < numValues) {
          if (cells[north][cell] === 1 || cells[south][cell] === 1 || cells[west][cell] === 1 || cells[east][cell] === 1) {
            if (north < numValues && south < numValues && west < numValues && east < numValues) {
              const [r, g, b, a] = color;
              this.color(r, g, b, a);
            }
          }
        }
      }`,
      {
        constants: { w: width, h: height },
        output: [width, height],
        graphical: true,
        dynamicArguments: true,
      }
    );
    kernelRef.current = kernel;
  }, [gpu, width, height]);

  useEffect(() => {
    const kernel = kernelRef.current;
    // Cell beyond the cell matrix, so it's not in the frame
    if (cell > cellMatrix[0].length) {
      // Remove the tool canvas
      setBitmaps((bitmaps) => {
        const { tool, ...rest } = bitmaps;
        return rest;
      });
    } else if (labeledArray && cellMatrix) {
      const numValues = cellMatrix.length;
      kernel(labeledArray, cellMatrix, numValues, cell, color);
      // Rerender the parent canvas
      createImageBitmap(kernel.canvas).then((bitmap) => {
        setBitmaps((bitmaps) => ({ ...bitmaps, tool: bitmap }));
      });
    }
  }, [labeledArray, cellMatrix, cell, color, setBitmaps, width, height]);

  useEffect(
    () => () =>
      setBitmaps((bitmaps) => {
        const { tool, ...rest } = bitmaps;
        return rest;
      }),
    [setBitmaps]
  );

  return null;
}

export default OuterOutlineCanvas;

1	import { useSelector } from '@xstate/react';
2	import { useEffect, useRef } from 'react';
3	import {
4	useAlphaGpu,
5	useArrays,
6	useCanvas,
7	useCellMatrix,
8	useImage,
9	useLabeled,
10	} from '../../ProjectContext';
11
12	function OuterOutlineCanvas({ setBitmaps, cell, color }) {
13	const canvas = useCanvas();	×
14	const width = useSelector(canvas, (state) => state.context.width);	×
15	const height = useSelector(canvas, (state) => state.context.height);	×
16
17	const labeled = useLabeled();	×
18	const feature = useSelector(labeled, (state) => state.context.feature);	×
19
20	const image = useImage();	×
21	const t = useSelector(image, (state) => state.context.t);	×
22
23	const arrays = useArrays();	×
24	const labeledArray = useSelector(	×
25	arrays,
26	(state) => state.context.labeled && state.context.labeled[feature][t]	×
27	);
28
29	const cellMatrix = useCellMatrix();	×
30
31	const gpu = useAlphaGpu();	×
32	const kernelRef = useRef();	×
33
34	useEffect(() => {	×
35	const kernel = gpu.createKernel(	×
36	`function (data, cells, numValues, cell, color) {
37	const x = this.thread.x;
38	const y = this.constants.h - 1 - this.thread.y;
39	const value = data[y][x];
40	let north = 0;
41	let south = 0;
42	let east = 0;
43	let west = 0;
44	if (x !== 0) {
45	north = data[y][x - 1];
46	}
47	if (x !== this.constants.w - 1) {
48	south = data[y][x + 1];
49	}
50	if (y !== 0) {
51	west = data[y - 1][x];
52	}
53	if (y !== this.constants.h - 1) {
54	east = data[y + 1][x];
55	}
56	if (cells[value][cell] === 0 && value < numValues) {
57	if (cells[north][cell] === 1 \|\| cells[south][cell] === 1 \|\| cells[west][cell] === 1 \|\| cells[east][cell] === 1) {
58	if (north < numValues && south < numValues && west < numValues && east < numValues) {
59	const [r, g, b, a] = color;
60	this.color(r, g, b, a);
61	}
62	}
63	}
64	}`,
65	{
66	constants: { w: width, h: height },
67	output: [width, height],
68	graphical: true,
69	dynamicArguments: true,
70	}
71	);
72	kernelRef.current = kernel;	×
73	}, [gpu, width, height]);
74
75	useEffect(() => {	×
76	const kernel = kernelRef.current;	×
77	// Cell beyond the cell matrix, so it's not in the frame
78	if (cell > cellMatrix[0].length) {	×
79	// Remove the tool canvas
80	setBitmaps((bitmaps) => {	×
81	const { tool, ...rest } = bitmaps;	×
82	return rest;	×
83	});
84	} else if (labeledArray && cellMatrix) {	×
NEW 85	const numValues = cellMatrix.length;	×
NEW 86	kernel(labeledArray, cellMatrix, numValues, cell, color);	×
87	// Rerender the parent canvas
88	createImageBitmap(kernel.canvas).then((bitmap) => {	×
89	setBitmaps((bitmaps) => ({ ...bitmaps, tool: bitmap }));	×
90	});
91	}
92	}, [labeledArray, cellMatrix, cell, color, setBitmaps, width, height]);
93
94	useEffect(	×
95	() => () =>	×
96	setBitmaps((bitmaps) => {	×
97	const { tool, ...rest } = bitmaps;	×
98	return rest;	×
99	}),
100	[setBitmaps]
101	);
102
103	return null;	×
104	}
105
106	export default OuterOutlineCanvas;

vanvalenlab / deepcell-label / 3162711586

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous