4030421366

Build Type

github

Committed by GitHub

Commit Message

Merge f32c6d60c into afe72b53d

Pull Request Pull Request #392: Implement cell types machine, basic controls, and canvas rendering

Run Details

334 of 697 branches covered (47.92%)

Branch coverage included in aggregate %.

52 of 248 new or added lines in 24 files covered. (20.97%)

65 existing lines in 2 files now uncovered.

2484 of 3864 relevant lines covered (64.29%)

1105.84 hits per line

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

62.96

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

import { useSelector } from '@xstate/react';
import React from 'react';
import {
  useEditCells,
  useEditCellTypes,
  useEditDivisions,
  useEditSegment,
  useLabelMode,
} from '../../ProjectContext';
import AddDaughterCanvas from './AddDaughterCanvas';
import AddCellTypeCanvas from './AddCellTypeCanvas';
import BrushCanvas from './BrushCanvas';
import CellTypeCanvas from './CellTypeCanvas';
import FloodCanvas from './FloodCanvas';
import ReplaceCanvas from './ReplaceCanvas';
import SwapCanvas from './SwapCanvas';
import ThresholdCanvas from './ThresholdCanvas';
import WatershedCanvas from './WatershedCanvas';

function ToolCanvas({ setBitmaps }) {
  const editSegment = useEditSegment();
  const segmentTool = useSelector(editSegment, (state) => state.context.tool);

  const editCells = useEditCells();
  const cellsTool = useSelector(editCells, (state) => state.context.tool);

  const editDivisions = useEditDivisions();
  const addingDaughter = useSelector(editDivisions, (state) => state.matches('addingDaughter'));

  const editCellTypes = useEditCellTypes();
  const addingCell = useSelector(editCellTypes, (state) => state.matches('addingCell'));

  const labelMode = useLabelMode();
  const mode = useSelector(labelMode, (state) =>
    state.matches('editSegment')
      ? 'segment'
      : state.matches('editCells')
      ? 'cells'
      : state.matches('editDivisions')
      ? 'divisions'
      : state.matches('editCellTypes')
      ? 'cellTypes'
      : false
  );

  switch (mode) {
    case 'segment':
      switch (segmentTool) {
        case 'brush':
          return <BrushCanvas setBitmaps={setBitmaps} />;
        case 'flood':
          return <FloodCanvas setBitmaps={setBitmaps} />;
        case 'threshold':
          return <ThresholdCanvas setBitmaps={setBitmaps} />;
        case 'watershed':
          return <WatershedCanvas setBitmaps={setBitmaps} />;
        default:
          return null;
      }
    case 'cells':
      switch (cellsTool) {
        case 'swap':
          return <SwapCanvas setBitmaps={setBitmaps} />;
        case 'replace':
          return <ReplaceCanvas setBitmaps={setBitmaps} />;
        default:
          return null;
      }
    case 'divisions':
      if (addingDaughter) {
        return <AddDaughterCanvas setBitmaps={setBitmaps} />;
      }
      return null;
    case 'cellTypes':
      if (addingCell) {
        return (
          <>
            <CellTypeCanvas setBitmaps={setBitmaps} />
            <AddCellTypeCanvas setBitmaps={setBitmaps} />
          </>
        );
      }
      return <CellTypeCanvas setBitmaps={setBitmaps} />;
    default:
      return null;
  }
}

export default ToolCanvas;

1	import { useSelector } from '@xstate/react';
2	import React from 'react';
3	import {
4	useEditCells,
5	useEditCellTypes,
6	useEditDivisions,
7	useEditSegment,
8	useLabelMode,
9	} from '../../ProjectContext';
10	import AddDaughterCanvas from './AddDaughterCanvas';
11	import AddCellTypeCanvas from './AddCellTypeCanvas';
12	import BrushCanvas from './BrushCanvas';
13	import CellTypeCanvas from './CellTypeCanvas';
14	import FloodCanvas from './FloodCanvas';
15	import ReplaceCanvas from './ReplaceCanvas';
16	import SwapCanvas from './SwapCanvas';
17	import ThresholdCanvas from './ThresholdCanvas';
18	import WatershedCanvas from './WatershedCanvas';
19
20	function ToolCanvas({ setBitmaps }) {
21	const editSegment = useEditSegment();	614✔
22	const segmentTool = useSelector(editSegment, (state) => state.context.tool);	666✔
23
24	const editCells = useEditCells();	614✔
25	const cellsTool = useSelector(editCells, (state) => state.context.tool);	628✔
26
27	const editDivisions = useEditDivisions();	614✔
28	const addingDaughter = useSelector(editDivisions, (state) => state.matches('addingDaughter'));	630✔
29
30	const editCellTypes = useEditCellTypes();	614✔
31	const addingCell = useSelector(editCellTypes, (state) => state.matches('addingCell'));	630✔
32
33	const labelMode = useLabelMode();	614✔
34	const mode = useSelector(labelMode, (state) =>	614✔
35	state.matches('editSegment')	704✔
36	? 'segment'
37	: state.matches('editCells')	630!
38	? 'cells'
39	: state.matches('editDivisions')	630✔
40	? 'divisions'
41	: state.matches('editCellTypes')	608!
42	? 'cellTypes'
43	: false
44	);
45
46	switch (mode) {	614!
47	case 'segment':
48	switch (segmentTool) {	40!
49	case 'brush':
50	return <BrushCanvas setBitmaps={setBitmaps} />;	12✔
51	case 'flood':
52	return <FloodCanvas setBitmaps={setBitmaps} />;	8✔
53	case 'threshold':
54	return <ThresholdCanvas setBitmaps={setBitmaps} />;	8✔
55	case 'watershed':
56	return <WatershedCanvas setBitmaps={setBitmaps} />;	×
57	default:
58	return null;	12✔
59	}
60	case 'cells':
61	switch (cellsTool) {	×
62	case 'swap':
63	return <SwapCanvas setBitmaps={setBitmaps} />;	×
64	case 'replace':
65	return <ReplaceCanvas setBitmaps={setBitmaps} />;	×
66	default:
67	return null;	×
68	}
69	case 'divisions':
70	if (addingDaughter) {	14!
71	return <AddDaughterCanvas setBitmaps={setBitmaps} />;	×
72	}
73	return null;	14✔
74	case 'cellTypes':
NEW 75	if (addingCell) {	×
NEW 76	return (	×
77	<>
78	<CellTypeCanvas setBitmaps={setBitmaps} />
79	<AddCellTypeCanvas setBitmaps={setBitmaps} />
80	</>
81	);
82	}
NEW 83	return <CellTypeCanvas setBitmaps={setBitmaps} />;	×
84	default:
85	return null;	560✔
86	}
87	}
88
89	export default ToolCanvas;

vanvalenlab / deepcell-label / 4030421366

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