Fix/hybrid viewer refacto

app/components/CameraOrientation.vue

@@ -1,6 +1,6 @@
 <script setup>
 import ToolPanel from "@ogw_front/components/ToolPanel";
-import { applyCameraOptions } from "@ogw_internal/stores/hybrid_viewer_camera";
+import { applyCameraOptions } from "@ogw_internal/stores/hybrid_viewer/camera";
 import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { newInstance as vtkAnnotatedCubeActor } from "@kitware/vtk.js/Rendering/Core/AnnotatedCubeActor";
 import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";

app/stores/hybrid_viewer.js

@@ -1,80 +1,42 @@
-import {
-  ACTOR_COLOR,
-  BACKGROUND_COLOR,
-  WHEEL_TIME_OUT_MS,
-} from "@ogw_internal/stores/hybrid_viewer_constants";
 import {
   applySnapshot,
   getCameraOptions,
-  performCameraOrientation,
-  performFocusCameraOnObject,
-  performSetCamera,
-  performSyncRemoteCamera,
-} from "@ogw_internal/stores/hybrid_viewer_camera";
-import {
-  createClearHoverData,
-  createHoverHighlight,
-} from "@ogw_internal/stores/hybrid_viewer_highlight";
-import {
-  performAddItem,
-  performClear,
-  performClearHoverHighlight,
-  performClickPicking,
-  performRemoveItem,
-  performResize,
-  performSetClippingPlanes,
-  performSetContainer,
-  performSetShrink,
-  performSetVisibility,
-  performSetZScaling,
-} from "@ogw_internal/stores/hybrid_viewer";
-import { computeAverageBrightness } from "@ogw_internal/stores/hybrid_viewer_brightness";
-import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
+  useHybridViewerCamera,
+} from "@ogw_internal/stores/hybrid_viewer/camera";
+import { BACKGROUND_COLOR } from "@ogw_internal/stores/hybrid_viewer/constants";
+import { useHybridViewerBrightness } from "@ogw_internal/stores/hybrid_viewer/brightness";
+import { useHybridViewerFilters } from "@ogw_internal/stores/hybrid_viewer/filters";
+import { useHybridViewerHighlight } from "@ogw_internal/stores/hybrid_viewer/highlight";
+import { useHybridViewerScene } from "@ogw_internal/stores/hybrid_viewer/scene";
+import { useHybridViewerViewport } from "@ogw_internal/stores/hybrid_viewer/viewport";
 import { newInstance as vtkGenericRenderWindow } from "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow";
-import { newInstance as vtkMapper } from "@kitware/vtk.js/Rendering/Core/Mapper";
-import { newInstance as vtkXMLPolyDataReader } from "@kitware/vtk.js/IO/XML/XMLPolyDataReader";
 
 import { Status } from "@ogw_front/utils/status";
-import { useDataStore } from "@ogw_front/stores/data";
 import { useViewerStore } from "@ogw_front/stores/viewer";
 
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // oxlint-disable max-lines-per-function, max-statements
 export const useHybridViewerStore = defineStore("hybridViewer", () => {
-  const dataStore = useDataStore();
-  const hybridDb = reactive({});
   const viewerStore = useViewerStore();
-  const camera_options = reactive({});
   const genericRenderWindow = reactive({});
   const status = ref(Status.NOT_CREATED);
   const is_moving = ref(false);
   const is_picking = ref(false);
-  const is_hover_highlight = ref(false);
-  const hover_highlight_field_type = ref("CELL");
-  const hoverData = ref(undefined);
-  const hoverPosition = ref({ x: 0, y: 0 });
-  const zScale = ref(1);
   let imageStyle = undefined;
-  let viewStream = undefined;
-  let wheelEventEndTimeout = undefined;
-  const gridActor = undefined;
 
   watch(is_picking, (value) => {
-    const element = genericRenderWindow.value
-      ?.getApiSpecificRenderWindow()
-      ?.getCanvas()?.parentElement;
-    if (element) {
-      element.style.cursor = value ? "crosshair" : "default";
+    if (!genericRenderWindow.value) {
+      return;
+    }
+    const webGLRenderWindow = genericRenderWindow.value.getApiSpecificRenderWindow();
+    const canvas = webGLRenderWindow.getCanvas();
+    if (canvas && canvas.parentElement) {
+      canvas.parentElement.style.cursor = value ? "crosshair" : "default";
     }
   });
 
-  const latestImage = ref(undefined);
-  const offscreenCanvas =
-    typeof document === "undefined" ? undefined : document.createElement("canvas");
-  const offscreenCtx = offscreenCanvas
-    ? offscreenCanvas.getContext("2d", { willReadFrequently: true })
-    : undefined;
+  const brightnessStore = useHybridViewerBrightness();
 
   async function initHybridViewer() {
     if (status.value !== Status.NOT_CREATED) {
@@ -89,112 +51,25 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     imageStyle = webGLRenderWindow.getReferenceByName("bgImage").style;
     Object.assign(imageStyle, { transition: "opacity 0.1s ease-in", zIndex: 1 });
     await viewerStore.ws_connect();
-    viewStream = viewerStore.client.getImageStream().createViewStream("-1");
-    viewStream.onImageReady((event) => {
+    const imageStream = viewerStore.client.getImageStream();
+    viewportStore.viewStream.value = imageStream.createViewStream("-1");
+    viewportStore.viewStream.value.onImageReady((event) => {
       if (is_moving.value) {
         return;
       }
-      latestImage.value = event.image;
+      brightnessStore.latestImage.value = event.image;
       webGLRenderWindow.setBackgroundImage(event.image);
       imageStyle.opacity = 1;
     });
-    const camera = genericRenderWindow.value.getRenderer().getActiveCamera();
-    Object.assign(camera_options, getCameraOptions(camera));
+    const renderer = genericRenderWindow.value.getRenderer();
+    const camera = renderer.getActiveCamera();
+    Object.assign(cameraStore.camera_options, getCameraOptions(camera));
     camera.onModified(() => {
-      Object.assign(camera_options, getCameraOptions(camera));
+      Object.assign(cameraStore.camera_options, getCameraOptions(camera));
     });
     status.value = Status.CREATED;
   }
 
-  async function addItem(id) {
-    await performAddItem(id, {
-      genericRenderWindow: genericRenderWindow.value,
-      dataStore,
-      vtkXMLPolyDataReader,
-      vtkActor,
-      vtkMapper,
-      actorColor: ACTOR_COLOR,
-      hybridDb,
-    });
-  }
-
-  function removeItem(id) {
-    performRemoveItem(id, { genericRenderWindow: genericRenderWindow.value, hybridDb });
-  }
-
-  function setVisibility(id, visibility) {
-    performSetVisibility(id, visibility, {
-      genericRenderWindow: genericRenderWindow.value,
-      hybridDb,
-    });
-  }
-
-  async function setZScaling(z_scale) {
-    await performSetZScaling(z_scale, {
-      zScale,
-      genericRenderWindow: genericRenderWindow.value,
-      gridActor,
-      viewerStore,
-      viewer_schemas,
-      remoteRender,
-    });
-  }
-
-  async function setClippingPlanes(ids, planes) {
-    await performSetClippingPlanes(ids, planes, { viewerStore, viewer_schemas, remoteRender });
-  }
-
-  async function setShrink(ids, shrink_factor) {
-    await performSetShrink(ids, shrink_factor, { viewerStore, viewer_schemas, remoteRender });
-  }
-
-  function resetCamera() {
-    genericRenderWindow.value.getRenderer().resetCamera();
-    genericRenderWindow.value.getRenderWindow().render();
-    syncRemoteCamera();
-  }
-
-  async function focusCameraOnObject(id, block_ids = []) {
-    await performFocusCameraOnObject(id, {
-      hybridDb,
-      viewerStore,
-      viewer_schemas,
-      genericRenderWindow: genericRenderWindow.value,
-      block_ids,
-      is_moving,
-      imageStyle,
-      syncRemoteCamera,
-    });
-  }
-
-  function setCameraOrientation(orientation) {
-    performCameraOrientation(orientation, {
-      genericRenderWindow: genericRenderWindow.value,
-      is_moving,
-      imageStyle,
-      syncRemoteCamera,
-    });
-  }
-
-  function setCamera(targetCameraOptions) {
-    performSetCamera(targetCameraOptions, {
-      genericRenderWindow: genericRenderWindow.value,
-      is_moving,
-      imageStyle,
-      syncRemoteCamera,
-    });
-  }
-
-  function syncRemoteCamera() {
-    performSyncRemoteCamera({
-      genericRenderWindow: genericRenderWindow.value,
-      viewerStore,
-      viewer_schemas,
-      remoteRender,
-      camera_options,
-    });
-  }
-
   let renderPromise = undefined;
   let renderPending = false;
 
@@ -219,124 +94,35 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     return renderPromise;
   }
 
-  const hoverTimeoutRef = ref(undefined);
-  const currentHoverId = ref(undefined);
-
-  const clearHoverData = createClearHoverData(hoverTimeoutRef, hoverData, currentHoverId);
-
-  const hoverHighlight = createHoverHighlight({
-    genericRenderWindow,
-    is_hover_highlight,
-    viewerStore,
-    viewer_schemas,
-    hover_highlight_field_type,
-    hybridDb,
-    hoverData,
-    hoverPosition,
-    currentHoverId,
-    hoverTimeoutRef,
-    clearHoverData,
-  });
-
-  function clearHoverHighlight() {
-    clearHoverData();
-    performClearHoverHighlight({
-      viewerStore,
-      viewer_schemas,
-      hover_highlight_field_type,
-      hybridDb,
-    });
-  }
-
-  function setContainer(container) {
-    performSetContainer({
-      container,
-      genericRenderWindow: genericRenderWindow.value,
-      imageStyleSetter: (style) => (imageStyle = style),
-      resize,
-      useMousePressed,
-      useEventListener,
-      is_picking,
-      is_moving,
-      clickPickingCallback: performClickPicking,
-      viewerStore,
-      viewer_schemas,
-      syncRemoteCamera,
-      hoverHighlight,
-      wheelTimeoutMs: WHEEL_TIME_OUT_MS,
-      wheelEventEndTimeout,
-      wheelTimeoutSetter: (timeout) => (wheelEventEndTimeout = timeout),
-    });
-  }
-
-  async function resize(width, height) {
-    await performResize(width, height, {
-      viewerStore,
-      status,
-      Status,
-      genericRenderWindow: genericRenderWindow.value,
-      viewStream,
-      remoteRender,
-    });
-  }
-
-  function getAverageBrightness(rect) {
-    return computeAverageBrightness(rect, {
-      latestImage: latestImage.value,
-      offscreenCtx,
-      offscreenCanvas,
-      genericRenderWindow: genericRenderWindow.value,
-    });
-  }
+  const sceneStore = useHybridViewerScene();
+  const filtersStore = useHybridViewerFilters();
+  const highlightStore = useHybridViewerHighlight();
+  const cameraStore = useHybridViewerCamera();
+  const viewportStore = useHybridViewerViewport();
 
   function exportStores() {
-    const camera = genericRenderWindow.value.getRenderer().getActiveCamera();
-    return { zScale: zScale.value, camera_options: getCameraOptions(camera) || camera_options };
-  }
-
-  async function importStores(snapshot) {
-    await applySnapshot(snapshot, {
-      genericRenderWindow: genericRenderWindow.value,
-      setZScaling,
-      syncRemoteCamera,
-      setCamera,
-    });
-  }
-
-  function clear() {
-    performClear({ genericRenderWindow: genericRenderWindow.value, hybridDb });
+    const renderer = genericRenderWindow.value.getRenderer();
+    const camera = renderer.getActiveCamera();
+    return {
+      zScale: sceneStore.zScale.value,
+      camera_options: getCameraOptions(camera) || cameraStore.camera_options,
+    };
   }
 
   return {
-    hybridDb,
     genericRenderWindow,
-    addItem,
-    removeItem,
-    setVisibility,
-    setZScaling,
-    setClippingPlanes,
-    setShrink,
-    syncRemoteCamera,
-    setCamera,
+    status,
+    is_moving,
+    is_picking,
     initHybridViewer,
     remoteRender,
-    resize,
-    resetCamera,
-    focusCameraOnObject,
-    setCameraOrientation,
-    setContainer,
-    zScale,
-    is_picking,
-    is_hover_highlight,
-    hover_highlight_field_type,
-    clearHoverHighlight,
-    hoverData,
-    hoverPosition,
-    clear,
     exportStores,
-    importStores,
-    camera_options,
-    latestImage,
-    getAverageBrightness,
+    importStores: applySnapshot,
+    ...brightnessStore,
+    ...sceneStore,
+    ...viewportStore,
+    ...filtersStore,
+    ...highlightStore,
+    ...cameraStore,
   };
 });