Isosurface List

frontend/javascripts/oxalis/controller/combinations/segmentation_plane_controller.js

@@ -93,19 +93,12 @@ export function isosurfaceLeftClick(pos: Point2, plane: OrthoView, event: MouseE
 
   let cellId = 0;
   const position = calculateGlobalPos(pos);
-  const volumeTracingMaybe = Store.getState().tracing.volume;
-  if (volumeTracingMaybe) {
-    cellId = volumeTracingMaybe.activeCellId;
-  } else {
-    const segmentation = Model.getSegmentationLayer();
-    if (!segmentation) {
-      return;
-    }
-    cellId = segmentation.cube.getMappedDataValue(
-      position,
-      getRequestLogZoomStep(Store.getState()),
-    );
+  const segmentation = Model.getSegmentationLayer();
+  if (!segmentation) {
+    return;
   }
+  cellId = segmentation.cube.getMappedDataValue(position, getRequestLogZoomStep(Store.getState()));
+
   if (cellId > 0) {
     Store.dispatch(changeActiveIsosurfaceCellAction(cellId, position));
   }

frontend/javascripts/oxalis/controller/combinations/skeletontracing_plane_controller.js

@@ -49,10 +49,7 @@ import type { Edge, Tree, Node } from "oxalis/store";
 import api from "oxalis/api/internal_api";
 import getSceneController from "oxalis/controller/scene_controller_provider";
 import { renderToTexture } from "oxalis/view/rendering_utils";
-import {
-  isosurfaceLeftClick,
-  agglomerateSkeletonMiddleClick,
-} from "oxalis/controller/combinations/segmentation_plane_controller";
+import { agglomerateSkeletonMiddleClick } from "oxalis/controller/combinations/segmentation_plane_controller";
 import { getBaseVoxelFactors } from "oxalis/model/scaleinfo";
 import Dimensions from "oxalis/model/dimensions";
 
@@ -348,8 +345,6 @@ function onClick(
     } else {
       Store.dispatch(setActiveNodeAction(nodeId));
     }
-  } else if (shiftPressed && event != null) {
-    isosurfaceLeftClick(position, plane, event);
   }
 }
 

frontend/javascripts/oxalis/controller/combinations/volumetracing_plane_controller.js

@@ -39,7 +39,6 @@ import { movePlaneFlycamOrthoAction, setPositionAction } from "oxalis/model/acti
 import Model from "oxalis/model";
 import Store from "oxalis/store";
 import * as Utils from "libs/utils";
-import { isosurfaceLeftClick } from "oxalis/controller/combinations/segmentation_plane_controller";
 
 // TODO: Build proper UI for this
 window.isAutomaticBrushEnabled = false;
@@ -170,7 +169,6 @@ export function getPlaneMouseControls(_planeId: OrthoView): * {
         );
         if (cellId > 0) {
           Store.dispatch(setActiveCellAction(cellId));
-          isosurfaceLeftClick(pos, plane, event);
         }
       } else if (shouldFillCell) {
         Store.dispatch(floodFillAction(calculateGlobalPos(pos), plane));

frontend/javascripts/oxalis/controller/viewmodes/plane_controller.js

@@ -50,7 +50,6 @@ import getSceneController from "oxalis/controller/scene_controller_provider";
 import * as skeletonController from "oxalis/controller/combinations/skeletontracing_plane_controller";
 import * as volumeController from "oxalis/controller/combinations/volumetracing_plane_controller";
 import { downloadScreenshot } from "oxalis/view/rendering_utils";
-import { isosurfaceLeftClick } from "oxalis/controller/combinations/segmentation_plane_controller";
 
 const MAX_BRUSH_CHANGE_VALUE = 5;
 const BRUSH_CHANGING_CONSTANT = 0.02;
@@ -198,12 +197,7 @@ class PlaneController extends React.PureComponent<Props> {
       ...skeletonControls,
       // $FlowIssue[exponential-spread] See https://github.com/facebook/flow/issues/8299
       ...volumeControls,
-      leftClick: this.createToolDependentHandler(
-        maybeSkeletonLeftClick,
-        maybeVolumeLeftClick,
-        // The isosurfaceLeftClick handler should only be used in view mode.
-        isosurfaceLeftClick,
-      ),
+      leftClick: this.createToolDependentHandler(maybeSkeletonLeftClick, maybeVolumeLeftClick),
       leftDownMove: this.createToolDependentHandler(
         maybeSkeletonLeftDownMove,
         maybeVolumeLeftDownMove,

frontend/javascripts/oxalis/default_state.js

@@ -44,7 +44,6 @@ const defaultState: OxalisState = {
     loadingStrategy: "PROGRESSIVE_QUALITY",
     highlightHoveredCellId: true,
     segmentationPatternOpacity: 40,
-    renderIsosurfaces: false,
     renderMissingDataBlack: true,
   },
   userConfiguration: {
@@ -205,6 +204,7 @@ const defaultState: OxalisState = {
     hasOrganizations: false,
     isRefreshingIsosurfaces: false,
   },
+  isosurfaces: {},
 };
 
 export default defaultState;

frontend/javascripts/oxalis/model/actions/annotation_actions.js

@@ -6,6 +6,7 @@ import type {
   RemoteMeshMetaData,
   APIAnnotationVisibility,
 } from "types/api_flow_types";
+import type { Vector3 } from "oxalis/constants";
 import type { UserBoundingBox } from "oxalis/store";
 
 type InitializeAnnotationAction = {
@@ -71,8 +72,13 @@ export type CreateMeshFromBufferAction = {
   name: string,
 };
 
+export type TriggerActiveIsosurfaceDownloadAction = {
+  type: "TRIGGER_ACTIVE_ISOSURFACE_DOWNLOAD",
+};
+
 export type TriggerIsosurfaceDownloadAction = {
   type: "TRIGGER_ISOSURFACE_DOWNLOAD",
+  cellId: number,
 };
 
 export type RefreshIsosurfacesAction = {
@@ -82,6 +88,18 @@ export type RefreshIsosurfacesAction = {
 export type FinishedRefreshingIsosurfacesAction = {
   type: "FINISHED_REFRESHING_ISOSURFACES",
 };
+export type RefreshIsosurfaceAction = {
+  type: "REFRESH_ISOSURFACE",
+  cellId: number,
+};
+export type StartRefreshingIsosurfaceAction = {
+  type: "START_REFRESHING_ISOSURFACE",
+  cellId: number,
+};
+export type FinishedRefreshingIsosurfaceAction = {
+  type: "FINISHED_REFRESHING_ISOSURFACE",
+  cellId: number,
+};
 
 export type ImportIsosurfaceFromStlAction = {
   type: "IMPORT_ISOSURFACE_FROM_STL",
@@ -93,6 +111,12 @@ export type RemoveIsosurfaceAction = {
   cellId: number,
 };
 
+export type AddIsosurfaceAction = {
+  type: "ADD_ISOSURFACE",
+  cellId: number,
+  seedPosition: Vector3,
+};
+
 export type AnnotationActionTypes =
   | InitializeAnnotationAction
   | SetAnnotationNameAction
@@ -106,11 +130,16 @@ export type AnnotationActionTypes =
   | DeleteMeshAction
   | CreateMeshFromBufferAction
   | UpdateLocalMeshMetaDataAction
+  | TriggerActiveIsosurfaceDownloadAction
   | TriggerIsosurfaceDownloadAction
   | RefreshIsosurfacesAction
   | FinishedRefreshingIsosurfacesAction
+  | RefreshIsosurfaceAction
+  | StartRefreshingIsosurfaceAction
+  | FinishedRefreshingIsosurfaceAction
   | ImportIsosurfaceFromStlAction
-  | RemoveIsosurfaceAction;
+  | RemoveIsosurfaceAction
+  | AddIsosurfaceAction;
 
 export const initializeAnnotationAction = (
   annotation: APIAnnotation,
@@ -198,8 +227,15 @@ export const createMeshFromBufferAction = (
   name,
 });
 
-export const triggerIsosurfaceDownloadAction = (): TriggerIsosurfaceDownloadAction => ({
+export const triggerActiveIsosurfaceDownloadAction = (): TriggerActiveIsosurfaceDownloadAction => ({
+  type: "TRIGGER_ACTIVE_ISOSURFACE_DOWNLOAD",
+});
+
+export const triggerIsosurfaceDownloadAction = (
+  cellId: number,
+): TriggerIsosurfaceDownloadAction => ({
   type: "TRIGGER_ISOSURFACE_DOWNLOAD",
+  cellId,
 });
 
 export const refreshIsosurfacesAction = (): RefreshIsosurfacesAction => ({
@@ -210,6 +246,25 @@ export const finishedRefreshingIsosurfacesAction = (): FinishedRefreshingIsosurf
   type: "FINISHED_REFRESHING_ISOSURFACES",
 });
 
+export const refreshIsosurfaceAction = (cellId: number): RefreshIsosurfaceAction => ({
+  type: "REFRESH_ISOSURFACE",
+  cellId,
+});
+
+export const startRefreshingIsosurfaceAction = (
+  cellId: number,
+): StartRefreshingIsosurfaceAction => ({
+  type: "START_REFRESHING_ISOSURFACE",
+  cellId,
+});
+
+export const finishedRefreshingIsosurfaceAction = (
+  cellId: number,
+): FinishedRefreshingIsosurfaceAction => ({
+  type: "FINISHED_REFRESHING_ISOSURFACE",
+  cellId,
+});
+
 export const importIsosurfaceFromStlAction = (
   buffer: ArrayBuffer,
 ): ImportIsosurfaceFromStlAction => ({
@@ -221,3 +276,12 @@ export const removeIsosurfaceAction = (cellId: number): RemoveIsosurfaceAction =
   type: "REMOVE_ISOSURFACE",
   cellId,
 });
+
+export const addIsosurfaceAction = (
+  cellId: number,
+  seedPosition: Vector3,
+): AddIsosurfaceAction => ({
+  type: "ADD_ISOSURFACE",
+  cellId,
+  seedPosition,
+});

frontend/javascripts/oxalis/model/reducers/annotation_reducer.js

@@ -107,6 +107,35 @@ function AnnotationReducer(state: OxalisState, action: Action): OxalisState {
       return updateKey(state, "tracing", { meshes: newMeshes });
     }
 
+    case "REMOVE_ISOSURFACE": {
+      const { cellId } = action;
+      return update(state, {
+        isosurfaces: { $unset: [cellId] },
+      });
+    }
+
+    case "ADD_ISOSURFACE": {
+      const { cellId, seedPosition } = action;
+      return updateKey2(state, "isosurfaces", cellId.toString(), {
+        segmentId: cellId,
+        seedPosition,
+      });
+    }
+
+    case "START_REFRESHING_ISOSURFACE": {
+      const { cellId } = action;
+      return updateKey2(state, "isosurfaces", cellId.toString(), {
+        isLoading: true,
+      });
+    }
+
+    case "FINISHED_REFRESHING_ISOSURFACE": {
+      const { cellId } = action;
+      return updateKey2(state, "isosurfaces", cellId.toString(), {
+        isLoading: false,
+      });
+    }
+
     default:
       return state;
   }