Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CELE-107 Selection sync across widgets #64

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
78744c5
CELE-107 Initialize segment with style depending on selected neurons
dvcorreia Oct 14, 2024
3d59192
Fix missing side-effect behavior for synchronizers
aranega Oct 15, 2024
5d78d91
Merge branch 'fix/side-effect-synchronizers' into feature/CELE-107
dvcorreia Oct 16, 2024
18d7b9f
CELE-107 Add working sync selection with the EM viewer
dvcorreia Oct 28, 2024
9350899
CELE-107 Remove unused imports
dvcorreia Oct 28, 2024
9a3fc00
CELE-107 Fix blanc segmentation layer first paint
dvcorreia Oct 29, 2024
2533466
CELE-107 Fix selectedNeurons not being shown when scroll to next slice
dvcorreia Oct 29, 2024
d7032d1
CELE-107 Code simplification
dvcorreia Oct 30, 2024
70e4455
CELE-107 Fix initial seg load not showing selection
dvcorreia Oct 30, 2024
b13687f
CELE-107 Color picker changes EM viewer neuron color
dvcorreia Oct 30, 2024
3b92283
Merge branch 'develop' into feature/CELE-107
dvcorreia Oct 30, 2024
9697279
CELE-107 Outline for selected neurons
dvcorreia Oct 30, 2024
1882a6a
CELE-107 Fix color change on EM viewer neuron click
dvcorreia Oct 30, 2024
62afe21
CELE-107 Code changes from review input
dvcorreia Oct 31, 2024
a0629c4
Merge branch 'develop' into feature/CELE-107
aranega Nov 1, 2024
c66fe30
CELE-107 Fix some linting issues
aranega Nov 1, 2024
2525a4f
CELE-107 Code review changes
dvcorreia Nov 1, 2024
38afec8
CELE-107 Use class color in EM viewer if sub-neuron is clicked
aranega Nov 4, 2024
1afe2eb
CELE-107 Fix last issues with selection
aranega Nov 5, 2024
4f7d94c
CELE-107 Fix issue with active synchronizers
aranega Nov 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import "ol/ol.css";
import { type Feature, Map as OLMap, View } from "ol";
import type { FeatureLike } from "ol/Feature";
import ScaleLine from "ol/control/ScaleLine";
import type { Coordinate } from "ol/coordinate";
import { shiftKeyOnly } from "ol/events/condition";
import { getCenter } from "ol/extent";
import GeoJSON from "ol/format/GeoJSON";
Expand All @@ -12,59 +13,15 @@ import VectorLayer from "ol/layer/Vector";
import { Projection } from "ol/proj";
import { XYZ } from "ol/source";
import VectorSource from "ol/source/Vector";
import Fill from "ol/style/Fill";
import Stroke from "ol/style/Stroke";
import Style from "ol/style/Style";
import Text from "ol/style/Text";
import { TileGrid } from "ol/tilegrid";
import { useEffect, useMemo, useRef } from "react";
import { useEffect, useMemo, useRef, useState } from "react";
import { useGlobalContext } from "../../../contexts/GlobalContext.tsx";
import { SlidingRing } from "../../../helpers/slidingRing";
import { getEMDataURL, getSegmentationURL } from "../../../models/models.ts";
import { ViewerType, getEMDataURL, getSegmentationURL } from "../../../models/models.ts";
import type { Workspace } from "../../../models/workspace.ts";
import type { Dataset } from "../../../rest/index.ts";
import SceneControls from "./SceneControls.tsx";

const getFeatureStyle = (feature: FeatureLike) => {
const opacity = 0.2;
const [r, g, b] = feature.get("color");
const rgbaColor = `rgba(${r}, ${g}, ${b}, ${opacity})`;

return new Style({
stroke: new Stroke({
color: [r, g, b],
width: 2,
}),
fill: new Fill({
color: rgbaColor,
}),
});
};

const resetStyle = (feature: Feature) => {
feature.setStyle(getFeatureStyle(feature));
};

const setHighlightStyle = (feature: Feature) => {
const opacity = 0.5;
const [r, g, b] = feature.get("color");
const rgbaColor = `rgba(${r}, ${g}, ${b}, ${opacity})`;

const style = new Style({
stroke: new Stroke({
color: [r, g, b],
width: 4,
}),
fill: new Fill({
color: rgbaColor,
}),
text: new Text({
text: feature.get("name"),
scale: 2,
}),
});

feature.setStyle(style);
};
import { activeNeuronStyle, neuronFeatureName, selectedNeuronStyle } from "./neuronsMapFeature.ts";

const newEMLayer = (dataset: Dataset, slice: number, tilegrid: TileGrid, projection: Projection): TileLayer<XYZ> => {
return new TileLayer({
Expand All @@ -84,11 +41,62 @@ const newSegLayer = (dataset: Dataset, slice: number) => {
url: getSegmentationURL(dataset, slice),
format: new GeoJSON(),
}),
style: getFeatureStyle,
zIndex: 1,
});
};

function neuronsStyle(feature: FeatureLike, workspace: Workspace) {
const neuronName = neuronFeatureName(feature);

const visibleNeurons = workspace.getVisibleNeuronsInEM();
const visibleNeuron = visibleNeurons.find((neuron) => neuron === neuronName);
aranega marked this conversation as resolved.
Show resolved Hide resolved
const color = visibleNeuron ? workspace.visibilities[neuronName][ViewerType.EM].color : undefined;
aranega marked this conversation as resolved.
Show resolved Hide resolved

const selectedNeuron = workspace.getViewerSelectedNeurons(ViewerType.EM).find((neuron) => neuron === neuronName);
aranega marked this conversation as resolved.
Show resolved Hide resolved
if (selectedNeuron) {
return selectedNeuronStyle(feature, color);
}

if (visibleNeuron) {
return activeNeuronStyle(feature, color);
}

return null;
}

function isNeuronVisible(neuronId: string, workspace: Workspace): boolean {
aranega marked this conversation as resolved.
Show resolved Hide resolved
const inVisibles = workspace.getVisibleNeuronsInEM().find((n) => n === neuronId);
if (inVisibles) {
return true;
}

return workspace.getViewerSelectedNeurons(ViewerType.EM).find((n) => n === neuronId) != undefined;
}

function onNeuronSelect(position: Coordinate, source: VectorSource<Feature> | undefined, workspace: Workspace) {
const features = source?.getFeaturesAtCoordinate(position);
if (!features || features.length === 0) {
return;
}

const feature = features[0];
const neuronName = neuronFeatureName(feature);

if (!isNeuronVisible(neuronName, workspace)) {
return;
}

const selectedNeurons = workspace.getViewerSelectedNeurons(ViewerType.EM);
aranega marked this conversation as resolved.
Show resolved Hide resolved
const isSelected = selectedNeurons.includes(neuronName);

if (isSelected) {
workspace.removeSelection(neuronName, ViewerType.EM);
return;
}

workspace.addSelection(neuronName, ViewerType.EM);
}

const scale = new ScaleLine({
units: "metric",
});
Expand All @@ -101,19 +109,18 @@ const interactions = defaultInteractions({
}),
]);

// const EMStackViewer = ({ dataset }: EMStackViewerParameters) => {
const EMStackViewer = () => {
const currentWorkspace = useGlobalContext().getCurrentWorkspace();

// We take the first active dataset at the moment (will change later)
const firstActiveDataset = Object.values(currentWorkspace.activeDatasets)?.[0];
const [minSlice, maxSlice] = firstActiveDataset.emData.sliceRange;
const startSlice = Math.floor((maxSlice + minSlice) / 2);
const [segSlice, segSetSlice] = useState<number>(startSlice);
const ringSize = 11;

const mapRef = useRef<OLMap | null>(null);
const currSegLayer = useRef<VectorLayer<Feature> | null>(null);
const clickedFeature = useRef<Feature | null>(null);

const ringEM = useRef<SlidingRing<TileLayer<XYZ>>>();
const ringSeg = useRef<SlidingRing<VectorLayer<Feature>>>();
Expand Down Expand Up @@ -153,6 +160,19 @@ const EMStackViewer = () => {
// }),
// });

const neuronsStyleRef = useRef((feature: FeatureLike) => neuronsStyle(feature, currentWorkspace));
const onNeuronSelectRef = useRef((position) => onNeuronSelect(position, currSegLayer.current?.getSource(), currentWorkspace));

useEffect(() => {
if (!currSegLayer.current?.getSource()) {
return;
}

neuronsStyleRef.current = (feature: Feature) => neuronsStyle(feature, currentWorkspace);
onNeuronSelectRef.current = (position) => onNeuronSelect(position, currSegLayer.current.getSource(), currentWorkspace);
currSegLayer.current.getSource().changed();
}, [currentWorkspace.getVisibleNeuronsInEM(), currentWorkspace.visibilities, currentWorkspace.getViewerSelectedNeurons(ViewerType.EM), segSlice]);

useEffect(() => {
if (mapRef.current) {
return;
Expand Down Expand Up @@ -199,12 +219,14 @@ const EMStackViewer = () => {
onPush: (slice) => {
const layer = newSegLayer(firstActiveDataset, slice);
layer.setOpacity(0);
layer.setStyle((feature) => neuronsStyleRef.current(feature));
map.addLayer(layer);
return layer;
},
onSelected: (_, layer) => {
onSelected: (slice, layer) => {
layer.setOpacity(1);
currSegLayer.current = layer;
segSetSlice(slice);
},
onUnselected: (_, layer) => {
layer.setOpacity(0);
Expand All @@ -214,30 +236,9 @@ const EMStackViewer = () => {
},
});

map.on("click", (evt) => {
if (!currSegLayer.current) return;

const features = currSegLayer.current.getSource().getFeaturesAtCoordinate(evt.coordinate);
if (features.length === 0) return;

const feature = features[0];
if (clickedFeature.current) {
resetStyle(clickedFeature.current);
}

if (feature) {
setHighlightStyle(feature as Feature);
clickedFeature.current = feature as Feature;
console.log("Feature", feature.get("name"), feature);
}
});

map.getTargetElement().addEventListener("wheel", (e) => {
if (e.shiftKey) {
return;
}
map.on("click", (e) => onNeuronSelectRef.current(e.coordinate));

e.preventDefault();
function handleSliceScroll(e: WheelEvent) {
const scrollUp = e.deltaY < 0;

if (scrollUp) {
Expand All @@ -247,6 +248,28 @@ const EMStackViewer = () => {
ringEM.current.prev();
ringSeg.current.prev();
}
}

function handleZoomScroll(e: WheelEvent) {
const scrollUp = e.deltaY < 0;

const view = map.getView();
const zoom = view.getZoom();

if (scrollUp) {
view.setZoom(view.getConstrainedZoom(zoom + 1, 1));
} else {
view.setZoom(view.getConstrainedZoom(zoom - 1, -1));
}
}

map.getTargetElement().addEventListener("wheel", (e) => {
e.preventDefault();
if (e.shiftKey) {
handleZoomScroll(e);
return;
}
handleSliceScroll(e);
});

// set map zoom to the minimum zoom possible
Expand Down Expand Up @@ -305,7 +328,7 @@ const EMStackViewer = () => {

export default EMStackViewer;

function printEMView(map: OLMap) {
export function printEMView(map: OLMap) {
const mapCanvas = document.createElement("canvas");

const size = map.getSize();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { FeatureLike } from "ol/Feature";
import Fill from "ol/style/Fill";
import Stroke from "ol/style/Stroke";
import Style from "ol/style/Style";
import Text from "ol/style/Text";

export function hexToRGBArray(hex: string): [number, number, number] {
hex = hex.replace("#", "");
const r = parseInt(hex.slice(0, 2), 16);
const g = parseInt(hex.slice(2, 4), 16);
const b = parseInt(hex.slice(4, 6), 16);

return [r, g, b];
}

export function activeNeuronStyle(feature: FeatureLike, color?: string): Style {
const opacity = 0.2;
const [r, g, b] = color ? hexToRGBArray(color) : feature.get("color");
const rgbaColor = `rgba(${r}, ${g}, ${b}, ${opacity})`;

return new Style({
stroke: new Stroke({
color: [r, g, b],
width: 2,
}),
fill: new Fill({
color: rgbaColor,
}),
});
}

export function selectedNeuronStyle(feature: FeatureLike, color?: string): Style {
const opacity = 0.5;
const [r, g, b] = color ? hexToRGBArray(color) : feature.get("color");
const rgbaColor = `rgba(${r}, ${g}, ${b}, ${opacity})`;

return new Style({
stroke: new Stroke({
color: [r, g, b],
width: 4,
}),
fill: new Fill({
color: rgbaColor,
}),
text: new Text({
text: feature.get("name"),
scale: 2,
}),
});
}

export function neuronFeatureName(feature: FeatureLike): string {
const properties = feature.getProperties();
aranega marked this conversation as resolved.
Show resolved Hide resolved
if (!properties.hasOwnProperty("name")) {
throw Error("neuron segment doesn't have a name property");
}

const neuronName = properties["name"];
if (typeof neuronName !== "string") {
throw Error("neuron segment name is not a string");
}

return neuronName;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Outlines } from "@react-three/drei";
import type { ThreeEvent } from "@react-three/fiber";
import type { FC } from "react";
import { useCallback, type FC } from "react";
import { useSelector } from "react-redux";
import { type BufferGeometry, DoubleSide, NormalBlending } from "three";
import { useGlobalContext } from "../../../contexts/GlobalContext";
Expand All @@ -23,20 +23,23 @@ const STLMesh: FC<Props> = ({ id, color, opacity, renderOrder, isWireframe, stl
const { workspaces } = useGlobalContext();
const workspaceId = useSelector((state: RootState) => state.workspaceId);
const workspace: Workspace = workspaces[workspaceId];
const selectedNeurons = workspace.getViewerSelectedNeurons(ViewerType.Graph);
const selectedNeurons = workspace.getViewerSelectedNeurons(ViewerType.ThreeD);
const isSelected = selectedNeurons.includes(id);

const onClick = (event: ThreeEvent<MouseEvent>) => {
const clicked = getFurthestIntersectedObject(event);
const { id } = clicked.userData;
if (clicked) {
if (isSelected) {
console.log(`Neurons selected: ${id}`);
} else {
console.log(`Neurons un selected: ${id}`);
const onClick = useCallback(
(event: ThreeEvent<MouseEvent>) => {
const clicked = getFurthestIntersectedObject(event);
const { id } = clicked.userData;
if (clicked) {
if (isSelected) {
workspace.removeSelection(id, ViewerType.ThreeD);
} else {
workspace.addSelection(id, ViewerType.ThreeD);
}
}
}
};
},
[workspace],
);

return (
<mesh userData={{ id }} onClick={onClick} frustumCulled={false} renderOrder={renderOrder}>
Expand Down
Loading