fix: 上传完成内存泄漏

README.md

@@ -23,6 +23,8 @@ pnpm config set virtual-store-dir-max-length 70
 
 - 不同结构的窗宽窗位快速选择，需要考虑不同身体结构的dicom image
 
+- 炸显存问题，electron关闭硬件加速，还是无法接解决1000+外周的mpr
+
 ## 窗宽创维相关的一些小问题
 
 - 心脏软组织窗

apps/desktop/electron/ipcEvent/dicom/util.ts

@@ -108,11 +108,4 @@ export const uploadFilesInBatches = async ({
       totalEndTime - totalStartTime
     } ms`
   );
-
-  return {
-    totalSuccess,
-    totalFailed,
-    totalTime: totalEndTime - totalStartTime,
-    progress: 100,
-  };
 };

apps/desktop/electron/main.ts

@@ -38,7 +38,11 @@ const themeTitleBarStyles = {
 
 export const platform = process.platform === "darwin" ? "macos" : "windows";
 
-app.commandLine.appendSwitch('disable-web-security');
+app.commandLine.appendSwitch("disable-web-security");
+app.commandLine.appendSwitch("ignore-gpu-blocklist");
+app.commandLine.appendSwitch("use-angle", "gl");
+
+// app.disableHardwareAcceleration()
 
 function createWindow() {
   win = new BrowserWindow({
@@ -51,7 +55,7 @@ function createWindow() {
     titleBarOverlay: { height: 36, ...themeTitleBarStyles[theme] }, // 渲染进程发消息动态改变这个
     webPreferences: {
       preload: path.join(__dirname, "preload.mjs"),
-      nodeIntegration: true
+      nodeIntegration: true,
     },
   });
 

apps/desktop/package.json

@@ -75,7 +75,8 @@
     "react-router-dom": "^6.26.0",
     "tailwind-merge": "^2.4.0",
     "tailwindcss-animate": "^1.0.7",
-    "zod": "3.23.8"
+    "zod": "3.23.8",
+    "mitt": "3.0.1"
   },
   "devDependencies": {
     "@radix-ui/react-icons": "^1.3.0",

apps/desktop/src/components/base/MenuBar/index.tsx

@@ -28,19 +28,23 @@ import {
 } from "@/components/ui/dialog";
 import { Progress } from "@/components/ui/progress";
 import { RocketIcon } from "@radix-ui/react-icons";
+import emitter from "@/lib/events";
 
-interface ScanProgress {
-  percentage: number;
+interface UploadProgress {
+  progress: number;
+  totalSuccess: number;
+  totalFailed: number;
 }
 
-const defaultProgress = {
-  percentage: 0,
-};
-
 export const MenuBar = () => {
   const { toast } = useToast();
   const navigate = useNavigate();
-  const [progress, setProgress] = useState<ScanProgress>(defaultProgress);
+  const [uploading, setUploading] = useState<UploadProgress>({
+    progress: 0,
+    totalSuccess: 0,
+    totalFailed: 0,
+  });
+
   const [inferOption, setInferOption] =
     useState<inferDeviceType[]>(inferDevices);
   const [importDialogVisible, setImportDialogVisible] = useState(false);
@@ -48,9 +52,9 @@ export const MenuBar = () => {
   useEffect(() => {
     const handleUploadFeedback = (
       _event: Electron.IpcRendererEvent,
-      data: { progress: number; totalSuccess: number; totalFailed: number }
+      data: UploadProgress
     ) => {
-      setProgress({ percentage: data.progress });
+      setUploading(data);
     };
     window.ipcRenderer.on("dicom:upload:detail", handleUploadFeedback);
     return () => {
@@ -59,12 +63,20 @@ export const MenuBar = () => {
   }, []);
 
   useEffect(() => {
-    const visible = ![0, 100].includes(progress.percentage);
-    setImportDialogVisible(visible);
-  }, [progress.percentage]);
+    const p = uploading?.progress;
+    if (p > 0 && p < 100 && !importDialogVisible) {
+      setImportDialogVisible(true);
+    } else if (p === 100 && importDialogVisible) {
+      setImportDialogVisible(false);
+      toast({
+        title: "操作",
+        description: `导入完成，成功: ${uploading.totalSuccess}，失败： ${uploading.totalFailed}`,
+      });
+      emitter.emit("datasource:fetch");
+    }
+  }, [uploading, importDialogVisible, navigate, toast]);
 
   const handleImportDicom = () => {
-    navigate("datasource");
     window.ipcRenderer.send("dicom:upload");
   };
 
@@ -192,9 +204,9 @@ export const MenuBar = () => {
           <div className="flex items-center space-x-2">
             <Alert>
               <RocketIcon className="h-4 w-4" />
-              <AlertTitle>扫描进度</AlertTitle>
+              <AlertTitle>导入进度</AlertTitle>
               <AlertDescription>
-                <Progress value={progress?.percentage} />
+                <Progress value={uploading.progress} />
               </AlertDescription>
             </Alert>
           </div>

apps/desktop/src/lib/events.ts

@@ -0,0 +1,5 @@
+import mitt from "mitt";
+
+const emitter = mitt();
+
+export default emitter;

apps/desktop/src/pages/Datasource/index.tsx

@@ -13,6 +13,7 @@ import { PatientInfo, SeriesInfo } from "./type";
 import { PatientList } from "./PatientList";
 import { StudyList } from "./StudyList";
 import { SeriesList } from "./SeriesList";
+import emitter from "@/lib/events";
 
 export const Datasource = () => {
   const rawPatientsRef = useRef<PatientInfo[]>([]);
@@ -24,13 +25,20 @@ export const Datasource = () => {
   const navigate = useNavigate();
 
   useEffect(() => {
+    const fetchData = () => {
       window.ipcRenderer
         .invoke("dicom:select")
         .then((patients: PatientInfo[]) => {
-        console.log(patients);
+          console.log("patients", patients);
           rawPatientsRef.current = patients;
           setPatients(patients);
         });
+    };
+    fetchData();
+    emitter.on("datasource:fetch", fetchData);
+    return () => {
+      emitter.off("datasource:fetch", fetchData);
+    };
   }, []);
 
   const handlePatientSearch = (filterValue: string) => {

apps/desktop/src/pages/Viewer/ModelViewer/index.tsx

@@ -0,0 +1,3 @@
+export const Model3DViewer = () => {
+  return <div>3d model</div>;
+};

apps/desktop/src/pages/Viewer/MprViewer/CornerstoneDicomLoader/addManipulationBindings.ts

@@ -1,185 +0,0 @@
-import * as cornerstoneTools from '@cornerstonejs/tools';
-import type { Types } from '@cornerstonejs/tools';
-
-const {
-  LengthTool,
-  StackScrollMouseWheelTool,
-  StackScrollTool,
-  PanTool,
-  ZoomTool,
-  TrackballRotateTool,
-  Enums: csToolsEnums,
-} = cornerstoneTools;
-
-const { MouseBindings, KeyboardBindings } = csToolsEnums;
-
-let registered = false;
-
-export type ToolBinding = {
-  // A base tool to register.  Should only be defined once per tool
-  tool?: any;
-  // The tool name to base this on
-  baseTool?: string;
-  // The configuration to register with
-  configuration?: Record<string, any>;
-  // Sets to passive initially
-  passive?: boolean;
-  // Initial bindings
-  bindings?: Types.IToolBinding[];
-};
-
-/**
- * Adds navigation bindings to the given tool group.  Registers the basic
- * tool with CS Tools if register is true.
- *
- * Adds:
- * * Pan on Right or Primary+Ctrl
- * * Zoom on Middle, Primary+Shift
- * * Stack Scroll on Mouse Wheel, Primary+Alt
- * * Length Tool on fourth button
- *
- * Also allows registering other tools by having them in the options.toolMap with configuration values.
- */
-export default function addManipulationBindings(
-  toolGroup,
-  options: {
-    enableShiftClickZoom?: boolean;
-    is3DViewport?: boolean;
-    toolMap?: Map<string, ToolBinding>;
-  } = {}
-) {
-  const zoomBindings: Types.IToolBinding[] = [
-    {
-      mouseButton: MouseBindings.Secondary,
-    },
-  ];
-
-  const {
-    is3DViewport = false,
-    enableShiftClickZoom = false,
-    toolMap = new Map(),
-  } = options;
-
-  if (enableShiftClickZoom === true) {
-    zoomBindings.push({
-      mouseButton: MouseBindings.Primary, // Shift Left Click
-      modifierKey: KeyboardBindings.Shift,
-    });
-  }
-
-  if (!registered) {
-    cornerstoneTools.addTool(StackScrollMouseWheelTool);
-    cornerstoneTools.addTool(PanTool);
-    cornerstoneTools.addTool(ZoomTool);
-    cornerstoneTools.addTool(TrackballRotateTool);
-    cornerstoneTools.addTool(LengthTool);
-    cornerstoneTools.addTool(StackScrollTool);
-    for (const [, config] of toolMap) {
-      if (config.tool) {
-        cornerstoneTools.addTool(config.tool);
-      }
-    }
-  }
-
-  registered = true;
-
-  toolGroup.addTool(PanTool.toolName);
-  // Allow significant zooming to occur
-  toolGroup.addTool(ZoomTool.toolName, {
-    minZoomScale: 0.001,
-    maxZoomScale: 4000,
-  });
-  if (is3DViewport) {
-    toolGroup.addTool(TrackballRotateTool.toolName);
-  } else {
-    toolGroup.addTool(StackScrollMouseWheelTool.toolName);
-  }
-  toolGroup.addTool(LengthTool.toolName);
-  toolGroup.addTool(StackScrollTool.toolName);
-
-  toolGroup.setToolActive(PanTool.toolName, {
-    bindings: [
-      {
-        mouseButton: MouseBindings.Auxiliary,
-      },
-      {
-        numTouchPoints: 1,
-        modifierKey: KeyboardBindings.Ctrl,
-      },
-    ],
-  });
-  toolGroup.setToolActive(ZoomTool.toolName, {
-    bindings: zoomBindings,
-  });
-  // Need a binding to navigate without a wheel mouse
-  toolGroup.setToolActive(StackScrollTool.toolName, {
-    bindings: [
-      {
-        mouseButton: MouseBindings.Primary,
-        modifierKey: KeyboardBindings.Alt,
-      },
-      {
-        numTouchPoints: 1,
-        modifierKey: KeyboardBindings.Alt,
-      },
-    ],
-  });
-  // Add a length tool binding to allow testing annotations on examples targetting
-  // other use cases.  Use a primary button with shift+ctrl as that is relatively
-  // unlikely to be otherwise used.
-  toolGroup.setToolActive(LengthTool.toolName, {
-    bindings: [
-      {
-        mouseButton: MouseBindings.Primary,
-        modifierKey: KeyboardBindings.ShiftCtrl,
-      },
-      {
-        numTouchPoints: 1,
-        modifierKey: KeyboardBindings.ShiftCtrl,
-      },
-    ],
-  });
-
-  if (is3DViewport) {
-    toolGroup.setToolActive(TrackballRotateTool.toolName, {
-      bindings: [
-        {
-          mouseButton: MouseBindings.Primary,
-        },
-      ],
-    });
-  } else {
-    toolGroup.setToolActive(StackScrollMouseWheelTool.toolName);
-  }
-
-  // Add extra tools from the toolMap
-  for (const [toolName, config] of toolMap) {
-    if (config.baseTool) {
-      if (!toolGroup.hasTool(config.baseTool)) {
-        toolGroup.addTool(
-          config.baseTool,
-          toolMap.get(config.baseTool)?.configuration
-        );
-      }
-      toolGroup.addToolInstance(
-        toolName,
-        config.baseTool,
-        config.configuration
-      );
-    } else if (!toolGroup.hasTool(toolName)) {
-      toolGroup.addTool(toolName, config.configuration);
-    }
-    if (config.passive) {
-      // This can be applied during add/remove contours
-      toolGroup.setToolPassive(toolName);
-    }
-    if (config.bindings || config.selected) {
-      toolGroup.setToolActive(
-        toolName,
-        (config.bindings && config) || {
-          bindings: [{ mouseButton: MouseBindings.Primary }],
-        }
-      );
-    }
-  }
-}

apps/desktop/src/pages/Viewer/MprViewer/CornerstoneDicomLoader/initCornerstoneDicomImageLoader.ts

@@ -9,9 +9,12 @@ export const initCornerstoneDICOMImageLoader = () => {
   cornerstone.setUseSharedArrayBuffer(false);
   cornerstone.setConfiguration({
     detectGPUConfig: {
-      // benchmarksURL: "http://localhost:9000",
+      benchmarksURL: "",
+    },
+    rendering: {
+      ...cornerstone.getConfiguration().rendering,
+      // useNorm16Texture: true,
     },
-    rendering: cornerstone.getConfiguration().rendering,
     isMobile: false,
     enableCacheOptimization: false,
   });
@@ -22,6 +25,7 @@ export const initCornerstoneDICOMImageLoader = () => {
     useWebWorkers: true,
     decodeConfig: {
       convertFloatPixelDataToInt: false,
+      // use16BitDataType: false,
       use16BitDataType: preferSizeOverAccuracy || useNorm16Texture,
     },
   });
@@ -37,6 +41,7 @@ export const initCornerstoneDICOMImageLoader = () => {
     startWebWorkersOnDemand: false,
     taskConfiguration: {
       decodeTask: {
+        useNorm16Texture: true,
         initializeCodecsOnStartup: false,
         strict: false,
       },

apps/desktop/src/pages/Viewer/MprViewer/CornerstoneDicomLoader/setCtTransferFunctionForVolumeActor.ts

@@ -1,11 +1,5 @@
-type VOIRange = {
-  /** upper value for display */
-  upper: number;
-  /** lower value for display */
-  lower: number;
-};
 
-let ctVoiRange: VOIRange
+let ctVoiRange;
 
 export interface CtTransferFunction {
   volumeActor: any
@@ -15,7 +9,6 @@ export interface CtTransferFunction {
 
 export default function setCtTransferFunctionForVolumeActor(p: CtTransferFunction) {
   const { volumeActor, defaultWindowCenter, defaultWindowWidth } = p
-  console.log(defaultWindowCenter, defaultWindowWidth)
   const lower = defaultWindowCenter - defaultWindowWidth / 2.0;
   const upper = defaultWindowCenter + defaultWindowWidth / 2.0;
   ctVoiRange = { lower, upper };

apps/desktop/src/pages/Viewer/MprViewer/Crosshair.tsx

@@ -1,228 +0,0 @@
-import { useEffect, useRef } from "react";
-import * as cornerstoneTools from "@cornerstonejs/tools";
-import { PublicViewportInput } from "@cornerstonejs/core/dist/types/types/IViewport.js";
-import setCtTransferFunctionForVolumeActor from "./CornerstoneDicomLoader/setCtTransferFunctionForVolumeActor";
-import {
-  RenderingEngine,
-  setVolumesForViewports,
-  Enums as CoreEnums,
-  volumeLoader,
-} from "@cornerstonejs/core";
-import {
-  viewportColors,
-  viewportReferenceLineControllable,
-  viewportReferenceLineDraggableRotatable,
-  viewportReferenceLineSlabThicknessControlsOn,
-  viewportId1,
-  viewportId2,
-  viewportId3,
-  ViewportId,
-} from "./Crosshair.config";
-
-const viewportIds = [viewportId1, viewportId2, viewportId3];
-
-const {
-  ToolGroupManager,
-  CrosshairsTool,
-  StackScrollMouseWheelTool,
-  WindowLevelTool,
-  ZoomTool,
-  Enums: csToolsEnums,
-} = cornerstoneTools;
-
-const { MouseBindings } = csToolsEnums;
-
-const { ViewportType } = CoreEnums;
-
-function getReferenceLineColor(vpId: ViewportId) {
-  return viewportColors[vpId];
-}
-
-function getReferenceLineControllable(vpId: ViewportId) {
-  const index = viewportReferenceLineControllable.indexOf(vpId);
-  return index !== -1;
-}
-
-function getReferenceLineDraggableRotatable(vpId: ViewportId) {
-  const index = viewportReferenceLineDraggableRotatable.indexOf(vpId);
-  return index !== -1;
-}
-
-function getReferenceLineSlabThicknessControlsOn(vpId: ViewportId) {
-  const index = viewportReferenceLineSlabThicknessControlsOn.indexOf(vpId);
-  return index !== -1;
-}
-
-interface CrosshairMprProps {
-  wwwl: {
-    windowCenter: number;
-    windowWidth: number;
-  };
-  imageIds: string[];
-}
-
-export const CrosshairMpr = (props: CrosshairMprProps) => {
-  const containerRef = useRef<HTMLDivElement | null>(null);
-  const viewportRef_AXIAL = useRef<HTMLDivElement | null>(null);
-  const viewportRef_SAGITTAL = useRef<HTMLDivElement | null>(null);
-  const viewportRef_CORONAL = useRef<HTMLDivElement | null>(null);
-  const renderingEngine = useRef<RenderingEngine>();
-  const volumeId = "volumeId";
-  const toolGroupId = "mprToolGroup";
-  const renderingEngineId = "mprRenderingEngine";
-
-  useEffect(() => {
-
-
-    const run = async () => {
-      if (
-        viewportRef_AXIAL.current &&
-        viewportRef_SAGITTAL.current &&
-        viewportRef_CORONAL.current
-      ) {
-        console.log("mpr rendering");
-
-        renderingEngine.current = new RenderingEngine(renderingEngineId);
-
-        const viewportInputArray: PublicViewportInput[] = [
-          {
-            viewportId: viewportId1,
-            type: ViewportType.ORTHOGRAPHIC,
-            element: viewportRef_AXIAL.current,
-            defaultOptions: {
-              orientation: CoreEnums.OrientationAxis.AXIAL,
-              background: [0, 0, 0],
-            },
-          },
-          {
-            viewportId: viewportId2,
-            type: ViewportType.ORTHOGRAPHIC,
-            element: viewportRef_SAGITTAL.current,
-            defaultOptions: {
-              orientation: CoreEnums.OrientationAxis.SAGITTAL,
-              background: [0, 0, 0],
-            },
-          },
-          {
-            viewportId: viewportId3,
-            type: ViewportType.ORTHOGRAPHIC,
-            element: viewportRef_CORONAL.current,
-            defaultOptions: {
-              orientation: CoreEnums.OrientationAxis.CORONAL,
-              background: [0, 0, 0],
-            },
-          },
-        ];
-        renderingEngine.current.setViewports(viewportInputArray);
-
-        /**
-         * bug here: WebGL: INVALID_OPERATION: bindTexture: object does not belong to this context
-         */
-        await setVolumesForViewports(
-          renderingEngine.current,
-          [
-            {
-              volumeId: volumeId,
-              callback: ({ volumeActor }) =>
-                setCtTransferFunctionForVolumeActor({
-                  volumeActor,
-                  defaultWindowCenter: props.wwwl.windowCenter,
-                  defaultWindowWidth: props.wwwl.windowWidth,
-                }),
-            },
-          ],
-          viewportIds
-        );
-
-        const toolGroup = ToolGroupManager.createToolGroup(toolGroupId);
-
-        if (toolGroup) {
-          // 为使十字准线正常工作，目前必须在将工具设置为活动之前添加视口
-          toolGroup.addViewport(viewportId1, renderingEngineId);
-          toolGroup.addViewport(viewportId2, renderingEngineId);
-          toolGroup.addViewport(viewportId3, renderingEngineId);
-
-          toolGroup.addTool(ZoomTool.toolName);
-          toolGroup.addTool(StackScrollMouseWheelTool.toolName);
-          // 添加十字准线工具并将其配置为连接三个视口
-          toolGroup.addTool(CrosshairsTool.toolName, {
-            getReferenceLineColor,
-            getReferenceLineControllable,
-            getReferenceLineDraggableRotatable,
-            getReferenceLineSlabThicknessControlsOn,
-          });
-          toolGroup.addTool(WindowLevelTool.toolName);
-
-          toolGroup.setToolActive(CrosshairsTool.toolName, {
-            bindings: [{ mouseButton: 1 }],
-          });
-          toolGroup.setToolActive(ZoomTool.toolName, {
-            bindings: [
-              {
-                mouseButton: MouseBindings.Secondary, // 鼠标中键
-              },
-            ],
-          });
-          // using the `mouseWheelCallback`
-          toolGroup.setToolActive(StackScrollMouseWheelTool.toolName);
-          toolGroup.setToolActive(WindowLevelTool.toolName, {
-            bindings: [
-              {
-                mouseButton: MouseBindings.Auxiliary,
-              },
-            ],
-          });
-        }
-
-        renderingEngine.current.renderViewports(viewportIds);
-      }
-    };
-
-    run();
-
-    return () => {
-      renderingEngine.current?.disableElement(viewportId1);
-      renderingEngine.current?.disableElement(viewportId2);
-      renderingEngine.current?.disableElement(viewportId3);
-
-      // 从 ToolGroupManager 中移除工具组
-      ToolGroupManager.destroyToolGroup(toolGroupId);
-
-      // 销毁渲染引擎
-      renderingEngine.current?.destroy();
-    };
-  }, [props, renderingEngineId, toolGroupId]);
-
-  /**
-   * mpr resize
-   */
-  useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
-    let resizeTimeout: NodeJS.Timeout | null = null;
-    const resizeObserver = new ResizeObserver(() => {
-      if (resizeTimeout) clearTimeout(resizeTimeout);
-      resizeTimeout = setTimeout(() => renderingEngine.current?.resize(), 100);
-    });
-    resizeObserver.observe(container);
-    return () => {
-      if (resizeTimeout) clearTimeout(resizeTimeout);
-      resizeObserver.unobserve(container);
-      resizeObserver.disconnect();
-    };
-  }, []);
-
-  return (
-    <div ref={containerRef} className="w-full h-full flex flex-col">
-      <div
-        className="w-full h-1/3 border-b border-secondary"
-        ref={viewportRef_AXIAL}
-      />
-      <div
-        className="w-full h-1/3 border-b border-secondary"
-        ref={viewportRef_SAGITTAL}
-      />
-      <div className="w-full h-1/3" ref={viewportRef_CORONAL} />
-    </div>
-  );
-};

apps/desktop/src/pages/Viewer/MprViewer/index.config.tsx

@@ -5,6 +5,11 @@ export type ViewportId = "CT_AXIAL" | "CT_SAGITTAL" | "CT_CORONAL";
 export const viewportId1: ViewportId = "CT_AXIAL";
 export const viewportId2: ViewportId = "CT_SAGITTAL";
 export const viewportId3: ViewportId = "CT_CORONAL";
+export const viewportIds: ViewportId[] = [
+  viewportId1,
+  viewportId2,
+  viewportId3,
+];
 
 export const viewportColors = {
   [viewportId1]: "rgb(200, 0, 0)",
@@ -34,3 +39,24 @@ export const viewportReferenceLineSlabThicknessControlsOn = [
 export const volumeName = "CT_VOLUME_ID"; // Id of the volume less loader prefix
 export const volumeLoaderScheme = "cornerstoneStreamingImageVolume"; // Loader id which defines which volume loader to use
 export const volumeId = `${volumeLoaderScheme}:${volumeName}`; // VolumeId with loader id + volume id
+export const toolGroupMprId = "toolMpr";
+export const toolGroupStackId = "toolStack";
+
+export function getReferenceLineColor(vpId: ViewportId) {
+  return viewportColors[vpId];
+}
+
+export function getReferenceLineControllable(vpId: ViewportId) {
+  const index = viewportReferenceLineControllable.indexOf(vpId);
+  return index !== -1;
+}
+
+export function getReferenceLineDraggableRotatable(vpId: ViewportId) {
+  const index = viewportReferenceLineDraggableRotatable.indexOf(vpId);
+  return index !== -1;
+}
+
+export function getReferenceLineSlabThicknessControlsOn(vpId: ViewportId) {
+  const index = viewportReferenceLineSlabThicknessControlsOn.indexOf(vpId);
+  return index !== -1;
+}

apps/desktop/src/pages/Viewer/StackViewer/index.config.ts

@@ -0,0 +1,2 @@
+export const stackViewportId = "stackNo1";
+export const toolGroupStackId = "toolStackNo1";

apps/desktop/src/pages/Viewer/StackViewer/index.tsx

@@ -1,158 +0,0 @@
-import { useEffect, useRef, useState } from "react";
-import * as cornerstoneTools from "@cornerstonejs/tools";
-import { PublicViewportInput } from "@cornerstonejs/core/dist/types/types/IViewport.js";
-import { Enums as CoreEnums, RenderingEngine } from "@cornerstonejs/core";
-import { IStackViewport } from "@cornerstonejs/core/dist/types/types";
-import { Slider } from "@/components/ui/slider";
-import { ctVoiRange } from "../MprViewer/CornerstoneDicomLoader/setCtTransferFunctionForVolumeActor";
-const {
-  ToolGroupManager,
-  WindowLevelTool,
-  ZoomTool,
-  Enums: csToolsEnums,
-} = cornerstoneTools;
-
-const { MouseBindings } = csToolsEnums;
-
-export interface StackViewerProps {
-  imageIds: string[];
-  wwwl: {
-    windowCenter: number;
-    windowWidth: number;
-  };
-}
-
-export const StackViewer = (props: StackViewerProps) => {
-  const viewportStackRef = useRef<HTMLDivElement | null>(null);
-  const renderingEngineRef = useRef<RenderingEngine>();
-  /**
-   * 当前的index
-   */
-  const [index, setIndex] = useState(Math.floor(props.imageIds.length / 2));
-  const containerRef = useRef<HTMLDivElement | null>(null);
-  const viewportId = "stackViewport";
-  const renderingEngineId = "stackRenderingEngine";
-  const toolGroupId = "stackToolGroup";
-
-  useEffect(() => {
-    if (!viewportStackRef.current) return;
-
-    const toolGroup = ToolGroupManager.createToolGroup(toolGroupId);
-
-    renderingEngineRef.current = new RenderingEngine(renderingEngineId);
-    const viewportInput: PublicViewportInput = {
-      viewportId,
-      type: CoreEnums.ViewportType.STACK, // 用于 Stack 视图
-      element: viewportStackRef.current,
-      defaultOptions: {
-        background: [0, 0, 0],
-      },
-    };
-    renderingEngineRef.current.enableElement(viewportInput);
-    const viewport = renderingEngineRef.current.getViewport(
-      viewportId
-    ) as IStackViewport;
-
-    viewport.setStack(props.imageIds);
-    // viewport.setProperties({
-    //   voiRange: ctVoiRange,
-    // });
-
-    if (toolGroup) {
-      toolGroup.addViewport(viewportId, renderingEngineId);
-      toolGroup.addTool(ZoomTool.toolName);
-      toolGroup.setToolActive(ZoomTool.toolName, {
-        bindings: [
-          {
-            mouseButton: MouseBindings.Secondary, // 鼠标中键
-          },
-        ],
-      });
-      toolGroup.addTool(WindowLevelTool.toolName);
-      toolGroup.setToolActive(WindowLevelTool.toolName, {
-        bindings: [
-          {
-            mouseButton: MouseBindings.Auxiliary,
-          },
-        ],
-      });
-    }
-
-    return () => {
-      ToolGroupManager.destroyToolGroup(toolGroupId);
-      renderingEngineRef.current?.disableElement(viewportId);
-      renderingEngineRef.current?.destroy();
-    };
-  }, [props.imageIds, renderingEngineId, viewportId]);
-
-  /**
-   * 滚轮换图逻辑
-   */
-  useEffect(() => {
-    const handleWheel = (event: WheelEvent) => {
-      const delta = event.deltaY > 0 ? -1 : 1;
-      if (delta === -1 && index === 0) return;
-      if (delta === 1 && index === props.imageIds.length - 1) return;
-      setIndex((p) => p + delta);
-    };
-    const stackElement = viewportStackRef.current;
-    stackElement?.addEventListener("wheel", handleWheel);
-    return () => {
-      stackElement?.removeEventListener("wheel", handleWheel);
-    };
-  }, [index, props.imageIds.length]);
-
-  useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
-    let resizeTimeout: NodeJS.Timeout | null = null;
-    const resizeObserver = new ResizeObserver(() => {
-      if (resizeTimeout) clearTimeout(resizeTimeout);
-      resizeTimeout = setTimeout(
-        () => renderingEngineRef.current?.resize(),
-        100
-      );
-    });
-    resizeObserver.observe(container);
-    return () => {
-      if (resizeTimeout) clearTimeout(resizeTimeout);
-      resizeObserver.unobserve(container);
-      resizeObserver.disconnect();
-    };
-  }, []);
-
-  /**
-   * 拖拽滚动条
-   */
-  const onChangeIndex = (value: number[]) => {
-    setIndex(value[0]);
-  };
-
-  useEffect(() => {
-    if (renderingEngineRef.current) {
-      const viewport = renderingEngineRef.current.getViewport(viewportId);
-      (viewport as IStackViewport).setImageIdIndex(index);
-    }
-  }, [index]);
-
-  return (
-    <div
-      ref={containerRef}
-      className="relative w-full h-full flex flex-col pb-8"
-    >
-      <div className="w-full h-full" ref={viewportStackRef} />
-      <div className="absolute w-1/2 left-1/2 transform -translate-x-1/2 bottom-4">
-        <div>
-          {index + 1}/{props.imageIds.length}
-        </div>
-        <Slider
-          value={[index]}
-          min={0}
-          max={props.imageIds.length - 1}
-          step={1}
-          onValueChange={onChangeIndex}
-        />
-      </div>
-    </div>
-  );
-};

apps/desktop/src/pages/Viewer/ToolBarMenu/index.tsx

@@ -5,9 +5,14 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
+import { ResetIcon } from "@radix-ui/react-icons";
 import { MoonIcon, PersonStanding } from "lucide-react";
 
-export const ToolBarMenu = () => {
+export interface ToolBarMenuProps {
+  onToolButtonClick?: (key: string) => void;
+}
+
+export const ToolBarMenu = (props: ToolBarMenuProps) => {
   return (
     <div className="flex gap-x-2">
       <TooltipProvider>
@@ -34,6 +39,22 @@ export const ToolBarMenu = () => {
           </TooltipContent>
         </Tooltip>
       </TooltipProvider>
+      <TooltipProvider>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={() => props.onToolButtonClick?.("reset")}
+            >
+              <ResetIcon className="h-4 w-4" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent side="bottom">
+            <p>复原</p>
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
     </div>
   );
 };

apps/desktop/src/pages/Viewer/index.css

@@ -0,0 +1,11 @@
+.stack-slider {
+  >span:first-child{
+    height: 8px;
+    border-radius: 0;
+  }
+  [role="slider"] {
+    width: 16px;
+    height: 8px;
+    border-radius: 0;
+  }
+}

apps/desktop/src/pages/Viewer/index.tsx

@@ -1,81 +1,273 @@
 import { useLocation } from "react-router-dom";
 import { initCornerstone } from "./MprViewer/CornerstoneDicomLoader/init";
-import { CrosshairMpr } from "./MprViewer/Crosshair";
+import * as cornerstoneTools from "@cornerstonejs/tools";
 import { useEffect, useRef, useState } from "react";
 import {
   ResizableHandle,
   ResizablePanel,
   ResizablePanelGroup,
 } from "@/components/ui/resizable";
-import { StackViewer } from "./StackViewer";
 import { createImageIdsAndCacheMetaData } from "./MprViewer/CornerstoneDicomLoader/createImageIdsAndCacheMetaData";
+import {
+  RenderingEngine,
+  setVolumesForViewports,
+  volumeLoader,
+  Enums as CoreEnums,
+  cache,
+} from "@cornerstonejs/core";
 
-import * as cornerstoneTools from "@cornerstonejs/tools";
-import { volumeLoader } from "@cornerstonejs/core";
+import {
+  IStackViewport,
+  IVolumeViewport,
+  PublicViewportInput,
+} from "@cornerstonejs/core/dist/types/types";
+import {
+  getReferenceLineColor,
+  getReferenceLineControllable,
+  getReferenceLineDraggableRotatable,
+  getReferenceLineSlabThicknessControlsOn,
+  toolGroupMprId,
+  toolGroupStackId,
+  viewportIds,
+} from "./MprViewer/index.config";
+import { Slider } from "@/components/ui/slider";
+import { stackViewportId } from "./StackViewer/index.config";
+import { ToolBarMenu } from "./ToolBarMenu";
+import { Model3DViewer } from "./ModelViewer";
+import useMultiResizeObserver from "./useMultiResizeObserver";
+import "./index.css";
+
+const {
+  ToolGroupManager,
+  CrosshairsTool,
+  StackScrollMouseWheelTool,
+  WindowLevelTool,
+  ZoomTool,
+  Enums: csToolsEnums,
+} = cornerstoneTools;
+
+const { MouseBindings } = csToolsEnums;
 
 const wadoRsRoot = "http://localhost:8042/dicom-web";
+const renderingEngineId = "renderEngineNo1";
 
-const { StackScrollMouseWheelTool, WindowLevelTool, ZoomTool, CrosshairsTool } =
-  cornerstoneTools;
+const { ViewportType, OrientationAxis } = CoreEnums;
 
 export const Viewer = () => {
-  const [cornerstoneLoaded, setCornerstoneLoaded] = useState(false);
+  const volumeViewport1Ref = useRef<HTMLDivElement | null>(null);
+  const volumeViewport2Ref = useRef<HTMLDivElement | null>(null);
+  const volumeViewport3Ref = useRef<HTMLDivElement | null>(null);
+  const stackViewportRef = useRef<HTMLDivElement | null>(null);
+
+  /**
+   * 当前的index
+   */
+  const [index, setIndex] = useState<number>(0);
   const location = useLocation();
   const queryParams = new URLSearchParams(location.search);
   const SeriesInstanceUID = queryParams.get("SeriesInstanceUID");
   const StudyInstanceUID = queryParams.get("StudyInstanceUID");
-  const imageIdsSorted = useRef<string[]>();
-  const wwwl = { windowCenter: 50, windowWidth: 850 };
-  const volumeId = "volumeId";
+  const [imageIds, setImageIds] = useState<string[]>();
+  const renderingEngineRef = useRef<RenderingEngine>();
+  const volumeId = SeriesInstanceUID;
+
+  useMultiResizeObserver(
+    [
+      stackViewportRef,
+      volumeViewport1Ref,
+      volumeViewport2Ref,
+      volumeViewport3Ref,
+    ],
+    () => renderingEngineRef.current?.resize()
+  );
 
   useEffect(() => {
-    const setImageOrderCache = async () => {
+    cornerstoneTools.addTool(StackScrollMouseWheelTool);
+    cornerstoneTools.addTool(CrosshairsTool);
+    cornerstoneTools.addTool(WindowLevelTool);
+    cornerstoneTools.addTool(ZoomTool);
+
+    const renderViewport = async () => {
       if (!StudyInstanceUID || !SeriesInstanceUID) return;
+      if (!volumeViewport1Ref.current) return;
+      if (!volumeViewport2Ref.current) return;
+      if (!volumeViewport3Ref.current) return;
+      if (!stackViewportRef.current) return;
+      renderingEngineRef.current = new RenderingEngine(renderingEngineId);
       // imageIds此时由于流式加载for mpr，是错乱的图片顺序
-      const unSortedImageIds = await createImageIdsAndCacheMetaData({
+      const imageIds = await createImageIdsAndCacheMetaData({
         StudyInstanceUID,
         SeriesInstanceUID,
         wadoRsRoot,
       });
 
       // 这一步会对imageIds进行排序，如果不排序imageIds会错误乱,stackViewport顺序会错误
-      const volume = await volumeLoader.createAndCacheVolume(volumeId, {
-        imageIds: unSortedImageIds,
-      });
+      const volume = await volumeLoader.createAndCacheVolume(
+        SeriesInstanceUID,
+        {
+          imageIds,
+        }
+      );
       volume.load();
 
-      imageIdsSorted.current = volume.imageIds;
+      const volumeViewportInput: PublicViewportInput[] = [
+        {
+          viewportId: viewportIds[0],
+          type: ViewportType.ORTHOGRAPHIC,
+          element: volumeViewport1Ref.current,
+          defaultOptions: {
+            orientation: OrientationAxis.AXIAL,
+            background: [0, 0, 0],
+          },
+        },
+        {
+          viewportId: viewportIds[1],
+          type: ViewportType.ORTHOGRAPHIC,
+          element: volumeViewport2Ref.current,
+          defaultOptions: {
+            orientation: OrientationAxis.SAGITTAL,
+            background: [0, 0, 0],
+          },
+        },
+        {
+          viewportId: viewportIds[2],
+          type: ViewportType.ORTHOGRAPHIC,
+          element: volumeViewport3Ref.current,
+          defaultOptions: {
+            orientation: OrientationAxis.CORONAL,
+            background: [0, 0, 0],
+          },
+        },
+      ];
+      const stackViewportInput: PublicViewportInput = {
+        viewportId: stackViewportId,
+        type: ViewportType.STACK, // 用于 Stack 视图
+        element: stackViewportRef.current,
+        defaultOptions: {
+          background: [0, 0, 0],
+        },
+      };
 
-      // 默认windowWidtth
-      const { windowCenter, windowWidth } = volume.cornerstoneImageMetaData;
-      console.log("默认窗宽/位: ", windowCenter, windowWidth);
+      renderingEngineRef.current.setViewports([
+        ...volumeViewportInput,
+        stackViewportInput,
+      ]);
+      const stackViewport = renderingEngineRef.current.getViewport(
+        stackViewportId
+      ) as IStackViewport;
 
-      setCornerstoneLoaded(true);
+      stackViewport.setStack(volume.imageIds);
+      setImageIds(volume.imageIds);
+
+      const toolGroupMpr = ToolGroupManager.createToolGroup(toolGroupMprId);
+      if (toolGroupMpr) {
+        viewportIds.forEach((vp) =>
+          toolGroupMpr.addViewport(vp, renderingEngineId)
+        );
+        toolGroupMpr.addTool(ZoomTool.toolName);
+        toolGroupMpr.addTool(WindowLevelTool.toolName);
+        toolGroupMpr.addTool(StackScrollMouseWheelTool.toolName);
+        toolGroupMpr.addTool(CrosshairsTool.toolName, {
+          getReferenceLineColor,
+          getReferenceLineControllable,
+          getReferenceLineDraggableRotatable,
+          getReferenceLineSlabThicknessControlsOn,
+        });
+        toolGroupMpr.setToolActive(ZoomTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Secondary }],
+        });
+        toolGroupMpr.setToolActive(CrosshairsTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Primary }],
+        });
+        toolGroupMpr.setToolActive(StackScrollMouseWheelTool.toolName);
+        toolGroupMpr.setToolActive(WindowLevelTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Auxiliary }],
+        });
+      }
+
+      const toolGroupStack = ToolGroupManager.createToolGroup(toolGroupStackId);
+      if (toolGroupStack) {
+        toolGroupStack.addViewport(stackViewportId, renderingEngineId);
+        toolGroupStack.addTool(ZoomTool.toolName);
+        toolGroupStack.setToolActive(ZoomTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Secondary }],
+        });
+        toolGroupStack.addTool(WindowLevelTool.toolName);
+        toolGroupStack.setToolActive(WindowLevelTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Auxiliary }],
+        });
+      }
+
+      /**
+       * 先注册toolGroup，不然会找不到viewportInfo
+       */
+      await setVolumesForViewports(
+        renderingEngineRef.current,
+        [{ volumeId: SeriesInstanceUID }],
+        viewportIds
+      );
     };
 
     initCornerstone(() => {
-      setImageOrderCache();
-
-      cornerstoneTools.addTool(StackScrollMouseWheelTool);
-      cornerstoneTools.addTool(WindowLevelTool);
-      cornerstoneTools.addTool(ZoomTool);
-      cornerstoneTools.addTool(CrosshairsTool);
+      renderViewport();
     });
 
     return () => {
-      // 移出工具注册
-      cornerstoneTools.removeTool(CrosshairsTool);
+      cache.purgeCache();
+      ToolGroupManager.destroy();
+      renderingEngineRef.current?.destroy();
+
       cornerstoneTools.removeTool(StackScrollMouseWheelTool);
+      cornerstoneTools.removeTool(CrosshairsTool);
       cornerstoneTools.removeTool(WindowLevelTool);
       cornerstoneTools.removeTool(ZoomTool);
     };
-  }, [SeriesInstanceUID, StudyInstanceUID]);
+  }, [SeriesInstanceUID, StudyInstanceUID, volumeId]);
+
+  const onChangeIndex = (value: number[]) => setIndex(value[0]);
+
+  /**
+   * 滚轮换图逻辑
+   */
+  useEffect(() => {
+    const handleWheel = (event: WheelEvent) => {
+      console.log("wheel");
+      if (!imageIds) return;
+      const delta = event.deltaY > 0 ? -1 : 1;
+      if (delta === -1 && index === 0) return;
+      if (delta === 1 && index === imageIds?.length - 1) return;
+      setIndex((p) => p + delta);
+    };
+    const stackElement = stackViewportRef.current;
+    stackElement?.addEventListener("wheel", handleWheel);
+    return () => {
+      stackElement?.removeEventListener("wheel", handleWheel);
+    };
+  }, [imageIds, index]);
+
+  // stack换图
+  useEffect(() => {
+    const engine = renderingEngineRef.current;
+    if (engine) {
+      const viewport = engine.getViewport(stackViewportId) as IStackViewport;
+      viewport?.setImageIdIndex(index);
+    }
+  }, [index]);
+
+  const onToolMenuClick = (key: string) => {
+    const engine = renderingEngineRef.current;
+    if (key === "reset" && engine) {
+      const viewport = engine.getViewport(viewportIds[0]) as IVolumeViewport;
+      viewport.resetCamera(true, true, true, true, false);
+      viewport.render();
+    }
+  };
 
   return (
     <div className="w-full h-full flex flex-col">
-      {/* <div className="flex-shrink-0 border-b border-secondary">
-        <ToolBarMenu />
-      </div> */}
+      <div className="flex-shrink-0 border-b border-secondary">
+        <ToolBarMenu onToolButtonClick={onToolMenuClick} />
+      </div>
       <div className="flex-grow">
         <ResizablePanelGroup direction="horizontal" className="w-full h-full">
           <ResizablePanel defaultSize={50}>
@@ -85,27 +277,49 @@ export const Viewer = () => {
                 className="w-full h-full"
               >
                 <ResizablePanel defaultSize={50}>
-                  <div className="w-full h-full">
-                    {cornerstoneLoaded && imageIdsSorted.current && (
-                      <StackViewer
-                        imageIds={imageIdsSorted.current}
-                        wwwl={wwwl}
+                  <div className="w-full h-full flex flex-col relative">
+                    <div ref={stackViewportRef} className="w-full flex-grow" />
+                    {imageIds && (
+                      <div className="absolute left-0 right-0 top-0 text-end">
+                        <Slider
+                          value={[index]}
+                          min={0}
+                          max={imageIds.length - 1}
+                          step={1}
+                          className="stack-slider"
+                          onValueChange={onChangeIndex}
                         />
+                        <div className="text-xs">
+                          {index + 1}/{imageIds.length}
+                        </div>
+                      </div>
                     )}
                   </div>
                 </ResizablePanel>
-                <ResizableHandle withHandle />
+                <ResizableHandle withHandle={false} />
                 <ResizablePanel defaultSize={50}>
-                  <div>bototm</div>
+                  <div className="w-full h-full">
+                    <Model3DViewer />
+                  </div>
                 </ResizablePanel>
               </ResizablePanelGroup>
             </div>
           </ResizablePanel>
           <ResizableHandle withHandle />
           <ResizablePanel defaultSize={50}>
-            {cornerstoneLoaded && imageIdsSorted.current && (
-              <CrosshairMpr wwwl={wwwl} imageIds={imageIdsSorted.current} />
-            )}
+            <ResizablePanelGroup direction="vertical" className="w-full h-full">
+              <ResizablePanel defaultSize={1 / 3}>
+                <div className="h-full" ref={volumeViewport1Ref} />
+              </ResizablePanel>
+              <ResizableHandle withHandle />
+              <ResizablePanel defaultSize={1 / 3}>
+                <div className="h-full" ref={volumeViewport2Ref} />
+              </ResizablePanel>
+              <ResizableHandle withHandle />
+              <ResizablePanel defaultSize={1 / 3}>
+                <div className="h-full" ref={volumeViewport3Ref} />
+              </ResizablePanel>
+            </ResizablePanelGroup>
           </ResizablePanel>
         </ResizablePanelGroup>
       </div>

apps/desktop/src/pages/Viewer/useMultiResizeObserver.tsx

@@ -0,0 +1,41 @@
+import { useEffect, RefObject } from "react";
+
+type ResizeObserverCallback = () => void;
+
+/**
+ * 自定义 Hook，用于监听多个 Ref 对象的尺寸变化
+ * @param refs - 要监听的 Ref 对象数组
+ * @param callback - 尺寸变化时调用的回调函数
+ */
+function useMultiResizeObserver(
+  refs: Array<RefObject<Element>>,
+  callback: ResizeObserverCallback
+) {
+  useEffect(() => {
+    const elements = refs
+      .map((ref) => ref.current)
+      .filter((el): el is Element => el !== null);
+
+    if (elements.length === 0) return;
+
+    let resizeTimeout: NodeJS.Timeout | null = null;
+    const resizeObserver = new ResizeObserver(() => {
+      if (resizeTimeout) clearTimeout(resizeTimeout);
+      resizeTimeout = setTimeout(callback, 100);
+    });
+
+    elements.forEach((element) => {
+      resizeObserver.observe(element);
+    });
+
+    return () => {
+      if (resizeTimeout) clearTimeout(resizeTimeout);
+      elements.forEach((element) => {
+        resizeObserver.unobserve(element);
+      });
+      resizeObserver.disconnect();
+    };
+  }, [refs, callback]);
+}
+
+export default useMultiResizeObserver;

apps/desktop/vite.config.ts

@@ -34,4 +34,11 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
     },
   },
+  server: {
+    cors: true,
+    headers: {
+      "Cross-Origin-Opener-Policy": "same-origin",
+      "Cross-Origin-Embedder-Policy": "require-corp",
+    },
+  },
 });

pnpm-lock.yaml

@@ -151,6 +151,9 @@ importers:
       lucide-react:
         specifier: ^0.408.0
         version: 0.408.0(react@18.3.1)
+      mitt:
+        specifier: 3.0.1
+        version: 3.0.1
       node-machine-id:
         specifier: 1.1.12
         version: 1.1.12
@@ -4034,6 +4037,9 @@ packages:
     resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==}
     engines: {node: '>= 18'}
 
+  mitt@3.0.1:
+    resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
+
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
@@ -9845,6 +9851,8 @@ snapshots:
       minipass: 7.1.2
       rimraf: 5.0.10
 
+  mitt@3.0.1: {}
+
   mkdirp-classic@0.5.3: {}
 
   mkdirp@1.0.4: {}