@cornerstonejs/tools 1.71.0 → 1.71.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.71.0",
+  "version": "1.71.2",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.71.0",
+    "@cornerstonejs/core": "^1.71.2",
     "@icr/polyseg-wasm": "0.4.0",
     "@types/offscreencanvas": "2019.7.3",
     "comlink": "^4.4.1",
@@ -59,5 +59,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "03c01970a50a7383de86bb15c8d4f344a8ff7d25"
+  "gitHead": "7adfc02d0c2268d971df17450c825c54a082bd3f"
 }

package/src/tools/displayTools/Contour/contourConfig.ts

@@ -3,7 +3,7 @@ import { ContourConfig } from '../../../types/ContourTypes';
 const defaultContourConfig: ContourConfig = {
   renderOutline: true,
   outlineWidthAutoGenerated: 3,
-  outlineWidthActive: 2,
+  outlineWidthActive: 1,
   outlineWidthInactive: 1,
   outlineOpacity: 1,
   outlineOpacityInactive: 0.85,
@@ -11,7 +11,7 @@ const defaultContourConfig: ContourConfig = {
   outlineDashInactive: undefined,
   outlineDashAutoGenerated: '5,3',
   activeSegmentOutlineWidthDelta: 0,
-  renderFill: true,
+  renderFill: false,
   fillAlpha: 0.5,
   fillAlphaInactive: 0.3,
   fillAlphaAutoGenerated: 0.3,

package/src/tools/displayTools/Contour/contourDisplay.ts

@@ -1,8 +1,4 @@
-import {
-  getEnabledElementByIds,
-  Types,
-  BaseVolumeViewport,
-} from '@cornerstonejs/core';
+import { getEnabledElementByIds, Types } from '@cornerstonejs/core';
 
 import Representations from '../../../enums/SegmentationRepresentations';
 import * as SegmentationState from '../../../stateManagement/segmentation/segmentationState';
@@ -11,10 +7,10 @@ import {
   SegmentationRepresentationConfig,
   ToolGroupSpecificRepresentation,
 } from '../../../types/SegmentationStateTypes';
-import { addOrUpdateVTKContourSets } from './vtkContour/addOrUpdateVTKContourSets';
 import removeContourFromElement from './removeContourFromElement';
-import { deleteConfigCache } from './vtkContour/contourConfigCache';
+import { deleteConfigCache } from './contourHandler/contourConfigCache';
 import { polySeg } from '../../../stateManagement/segmentation';
+import { handleContourSegmentation } from './contourHandler/handleContourSegmentation';
 
 let polySegConversionInProgress = false;
 
@@ -95,89 +91,19 @@ async function render(
     );
   }
 
-  // From here to below it is basically the legacy geometryId based
-  // contour rendering via vtkActors that has some bugs for display,
-  // as it sometimes appear and sometimes not, and it is not clear.
-  // We have moved to the new SVG based contours via our annotation tools
-  // check out annotationUIDsMap in the ContourSegmentationData type
-  const { geometryIds } = contourData;
-
-  if (!geometryIds?.length || !(viewport instanceof BaseVolumeViewport)) {
+  if (!contourData) {
     return;
   }
 
-  // add the contour sets to the viewport
-  addOrUpdateVTKContourSets(
-    viewport,
-    geometryIds,
-    representationConfig,
-    toolGroupConfig
-  );
-
-  /**
-   * The following logic could be added if we want to support the use case
-   * where the contour representation data is initiated using annotations
-   * in the state from the get-go , and not when the user draws a contour.
-   */
-  // if (contourData?.points?.length) {
-  //   // contourData = createAnnotationsFromPoints(contourData.points);
-  //   const contourSegmentationAnnotation = {
-  //     annotationUID: csUtils.uuidv4(),
-  //     data: {
-  //       contour: {
-  //         closed: true,
-  //         polyline: contourData.points,
-  //       },
-  //       segmentation: {
-  //         segmentationId,
-  //         segmentIndex: 1, // Todo
-  //         segmentationRepresentationUID:
-  //           representationConfig.segmentationRepresentationUID,
-  //       },
-  //     },
-  //     highlighted: false,
-  //     invalidated: false,
-  //     isLocked: false,
-  //     isVisible: true,
-  //     metadata: {
-  //       toolName: 'PlanarFreehandContourSegmentationTool',
-  //       FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
-  //       viewPlaneNormal: viewport.getCamera().viewPlaneNormal,
-  //     },
-  //   };
-
-  //   addAnnotation(contourSegmentationAnnotation, viewport.element);
-  // } else if (
-  //   !contourData &&
-  //   polySeg.canComputeRequestedRepresentation(
-  //     representationConfig.segmentationRepresentationUID
-  //   )
-  // ) {
-  // contourData = await polySeg.computeAndAddContourRepresentation(
-  //   segmentationId,
-  //   {
-  //     segmentationRepresentationUID:
-  //       representationConfig.segmentationRepresentationUID,
-  //     viewport,
-  //   }
-  // );
-  // }
-
-  // if (contourData?.geometryIds?.length) {
-  //   handleVTKContour({
-  //     viewport,
-  //     representationConfig,
-  //     toolGroupConfig,
-  //     geometryIds: contourData.geometryIds,
-  //   });
-  // } else if (contourData.annotationUIDsMap?.size) {
-  //   handleContourAnnotationSegmentation({
-  //     viewport,
-  //     representationConfig,
-  //     toolGroupConfig,
-  //     annotationUIDsMap: contourData.annotationUIDsMap,
-  //   });
-  // }
+  if (contourData?.geometryIds?.length) {
+    handleContourSegmentation(
+      viewport,
+      contourData.geometryIds,
+      contourData.annotationUIDsMap,
+      representationConfig,
+      toolGroupConfig
+    );
+  }
 }
 
 function _removeContourFromToolGroupViewports(
@@ -198,10 +124,7 @@ function _removeContourFromToolGroupViewports(
       viewportId,
       renderingEngineId
     );
-    removeContourFromElement(
-      enabledElement.viewport.element,
-      segmentationRepresentationUID
-    );
+    removeContourFromElement(segmentationRepresentationUID, toolGroupId);
   }
 }
 

package/src/tools/displayTools/Contour/contourHandler/handleContourSegmentation.ts

@@ -0,0 +1,207 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-empty-function */
+
+import { addAnnotation } from '../../../../stateManagement';
+import { cache, Types, utilities } from '@cornerstonejs/core';
+
+import {
+  SegmentationRepresentationConfig,
+  ToolGroupSpecificContourRepresentation,
+} from '../../../../types';
+import { getConfigCache, setConfigCache } from './contourConfigCache';
+import { getSegmentSpecificConfig } from './utils';
+import { addContourSegmentationAnnotation } from '../../../../utilities/contourSegmentation';
+
+import { validateGeometry } from './utils';
+
+function handleContourSegmentation(
+  viewport: Types.IVolumeViewport,
+  geometryIds: string[],
+  annotationUIDsMap: Map<number, Set<string>>,
+  contourRepresentation: ToolGroupSpecificContourRepresentation,
+  contourRepresentationConfig: SegmentationRepresentationConfig
+) {
+  const addOrUpdateFn = annotationUIDsMap.size
+    ? updateContourSets
+    : addContourSetsToElement;
+  addOrUpdateFn(
+    viewport,
+    geometryIds,
+    contourRepresentation,
+    contourRepresentationConfig
+  );
+}
+
+function updateContourSets(
+  viewport: Types.IVolumeViewport,
+  geometryIds: string[],
+  contourRepresentation: ToolGroupSpecificContourRepresentation,
+  contourRepresentationConfig: SegmentationRepresentationConfig
+) {
+  const { segmentationRepresentationUID, segmentsHidden } =
+    contourRepresentation;
+  const newContourConfig = contourRepresentationConfig.representations.CONTOUR;
+  const cachedConfig = getConfigCache(segmentationRepresentationUID);
+
+  const newOutlineWithActive = newContourConfig.outlineWidthActive;
+
+  if (cachedConfig?.outlineWidthActive !== newOutlineWithActive) {
+    setConfigCache(
+      segmentationRepresentationUID,
+      Object.assign({}, cachedConfig, {
+        outlineWidthActive: newOutlineWithActive,
+      })
+    );
+  }
+
+  const segmentsToSetToInvisible = [];
+  const segmentsToSetToVisible = [];
+
+  for (const segmentIndex of segmentsHidden) {
+    if (!cachedConfig.segmentsHidden.has(segmentIndex)) {
+      segmentsToSetToInvisible.push(segmentIndex);
+    }
+  }
+
+  for (const segmentIndex of cachedConfig.segmentsHidden) {
+    if (!segmentsHidden.has(segmentIndex)) {
+      segmentsToSetToVisible.push(segmentIndex);
+    }
+  }
+
+  const mergedInvisibleSegments = Array.from(cachedConfig.segmentsHidden)
+    .filter((segmentIndex) => !segmentsToSetToVisible.includes(segmentIndex))
+    .concat(segmentsToSetToInvisible);
+
+  const { segmentSpecificConfigs } = geometryIds.reduce(
+    (acc, geometryId) => {
+      const geometry = cache.getGeometry(geometryId);
+      const { data: contourSet } = geometry;
+      const segmentIndex = (contourSet as Types.IContourSet).getSegmentIndex();
+      const segmentSpecificConfig = getSegmentSpecificConfig(
+        contourRepresentation,
+        geometryId,
+        segmentIndex
+      );
+      acc.segmentSpecificConfigs[segmentIndex] = segmentSpecificConfig ?? {};
+
+      return acc;
+    },
+    { contourSets: [], segmentSpecificConfigs: {} }
+  );
+
+  const affectedSegments = [
+    ...mergedInvisibleSegments,
+    ...segmentsToSetToVisible,
+  ];
+
+  const hasCustomSegmentSpecificConfig = Object.values(
+    segmentSpecificConfigs
+  ).some((config) => Object.keys(config).length > 0);
+
+  if (affectedSegments.length || hasCustomSegmentSpecificConfig) {
+    setConfigCache(
+      segmentationRepresentationUID,
+      Object.assign({}, cachedConfig, {
+        segmentsHidden: new Set(segmentsHidden),
+      })
+    );
+  }
+
+  viewport.render();
+}
+
+function addContourSetsToElement(
+  viewport: Types.IVolumeViewport,
+  geometryIds: string[],
+  contourRepresentation: ToolGroupSpecificContourRepresentation,
+  contourRepresentationConfig: SegmentationRepresentationConfig
+) {
+  const { segmentationRepresentationUID, segmentationId, segmentsHidden } =
+    contourRepresentation;
+  const segmentSpecificMap = new Map();
+  geometryIds.forEach((geometryId) => {
+    const geometry = cache.getGeometry(geometryId);
+
+    if (!geometry) {
+      console.warn(
+        `No geometry found for geometryId ${geometryId}. Skipping render.`
+      );
+      return;
+    }
+
+    const segmentIndex = (geometry.data as Types.IContourSet).getSegmentIndex();
+
+    validateGeometry(geometry);
+
+    const segmentSpecificConfig = getSegmentSpecificConfig(
+      contourRepresentation,
+      geometryId,
+      segmentIndex
+    );
+
+    const contourSet = geometry.data as Types.IContourSet;
+
+    contourSet.contours.forEach((contour) => {
+      const { points, color, id } = contour;
+      const contourSegmentationAnnotation = {
+        annotationUID: utilities.uuidv4(),
+        data: {
+          contour: {
+            closed: true,
+            polyline: points,
+          },
+          segmentation: {
+            segmentationId,
+            segmentIndex,
+            color,
+            id,
+          },
+          handles: {},
+        },
+        handles: {},
+        highlighted: false,
+        autoGenerated: false,
+        invalidated: false,
+        isLocked: false,
+        isVisible: true,
+        metadata: {
+          referencedImageId: viewport.getCurrentImageId(),
+          toolName: 'PlanarFreehandContourSegmentationTool',
+          FrameOfReferenceUID: viewport.getFrameOfReferenceUID(),
+          viewPlaneNormal: viewport.getCamera().viewPlaneNormal,
+        },
+      };
+      const annotationGroupSelector = viewport.element;
+
+      addAnnotation(contourSegmentationAnnotation, annotationGroupSelector);
+
+      addContourSegmentationAnnotation(contourSegmentationAnnotation);
+    });
+
+    if (segmentSpecificConfig) {
+      segmentSpecificMap.set(segmentIndex, segmentSpecificConfig);
+    }
+  });
+
+  const outlineWidthActive =
+    contourRepresentationConfig.representations.CONTOUR.outlineWidthActive;
+
+  setConfigCache(
+    segmentationRepresentationUID,
+    Object.assign({}, getConfigCache(segmentationRepresentationUID), {
+      segmentsHidden: new Set(segmentsHidden),
+      segmentSpecificMap,
+      outlineWidthActive,
+    })
+  );
+
+  viewport.resetCamera();
+  viewport.render();
+}
+
+export {
+  handleContourSegmentation,
+  updateContourSets,
+  addContourSetsToElement,
+};

package/src/tools/displayTools/Contour/removeContourFromElement.ts

@@ -1,37 +1,43 @@
 import { getEnabledElement } from '@cornerstonejs/core';
 import type { Types } from '@cornerstonejs/core';
+import {
+  getSegmentationRepresentationByUID,
+  getSegmentation,
+} from '../../../stateManagement/segmentation/segmentationState';
+
+import { removeAnnotation } from '../../../stateManagement';
 
 /**
  * Remove the contour representation from the viewport's HTML Element.
  * NOTE: This function should not be called directly.
  *
- * @param element - The element that the segmentation is being added to.
  * @param segmentationRepresentationUID - The UID of the contour representation to remove.
+ * @param toolGroupId - The ID of the toolGroup that the segmentationRepresentation belongs to.
  * @param removeFromCache - boolean
  *
  * @internal
  */
 function removeContourFromElement(
-  element: HTMLDivElement,
   segmentationRepresentationUID: string,
+  toolGroupId: string,
   removeFromCache = false // Todo
 ): void {
-  const enabledElement = getEnabledElement(element);
-  const { viewport } = enabledElement;
+  const segmentationRepresentation = getSegmentationRepresentationByUID(
+    toolGroupId,
+    segmentationRepresentationUID
+  );
 
-  const actorEntries = (viewport as Types.IVolumeViewport).getActors();
+  const { segmentationId } = segmentationRepresentation;
 
-  // remove actors whose id has the same prefix as the segmentationRepresentationUID
-  const actorUIDsToRemove = actorEntries
-    .map(({ uid }) =>
-      uid.includes(segmentationRepresentationUID) ? uid : undefined
-    )
-    .filter(Boolean);
+  const segmentation = getSegmentation(segmentationId);
 
-  // @ts-ignore
-  viewport.removeActors(actorUIDsToRemove);
+  const { annotationUIDsMap } = segmentation.representationData.CONTOUR;
 
-  // Todo: add the logic to remove the svg contour segmentation representations as well
+  annotationUIDsMap.forEach((annotationSet) => {
+    annotationSet.forEach((annotationUID) => {
+      removeAnnotation(annotationUID);
+    });
+  });
 }
 
 export default removeContourFromElement;

package/dist/cjs/tools/displayTools/Contour/vtkContour/addContourSetsToElement.d.ts

@@ -1,3 +0,0 @@
-import { Types } from '@cornerstonejs/core';
-import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../../types';
-export declare function addContourSetsToElement(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig, contourActorUID: string): void;

package/dist/cjs/tools/displayTools/Contour/vtkContour/addContourSetsToElement.js

@@ -1,73 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addContourSetsToElement = void 0;
-const core_1 = require("@cornerstonejs/core");
-const DataArray_1 = __importDefault(require("@kitware/vtk.js/Common/Core/DataArray"));
-const AppendPolyData_1 = __importDefault(require("@kitware/vtk.js/Filters/General/AppendPolyData"));
-const Actor_1 = __importDefault(require("@kitware/vtk.js/Rendering/Core/Actor"));
-const Mapper_1 = __importDefault(require("@kitware/vtk.js/Rendering/Core/Mapper"));
-const utils_1 = require("./utils");
-const contourConfigCache_1 = require("./contourConfigCache");
-function addContourSetsToElement(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, contourActorUID) {
-    const { segmentationRepresentationUID, segmentsHidden } = contourRepresentation;
-    const appendPolyData = AppendPolyData_1.default.newInstance();
-    const scalarToColorMap = new Map();
-    const segmentSpecificMap = new Map();
-    geometryIds.forEach((geometryId) => {
-        const geometry = core_1.cache.getGeometry(geometryId);
-        if (!geometry) {
-            console.warn(`No geometry found for geometryId ${geometryId}. Skipping render.`);
-            return;
-        }
-        const segmentIndex = geometry.data.getSegmentIndex();
-        (0, utils_1.validateGeometry)(geometry);
-        const segmentSpecificConfig = (0, utils_1.getSegmentSpecificConfig)(contourRepresentation, geometryId, segmentIndex);
-        const contourSet = geometry.data;
-        const polyData = (0, utils_1.getPolyData)(contourSet);
-        const color = contourSet.getColor();
-        const size = polyData.getPoints().getNumberOfPoints();
-        const scalars = DataArray_1.default.newInstance({
-            size: size * 4,
-            numberOfComponents: 4,
-            dataType: 'Uint8Array',
-        });
-        for (let i = 0; i < size; ++i) {
-            scalars.setTuple(i, [...color, 255]);
-        }
-        polyData.getPointData().setScalars(scalars);
-        if (segmentSpecificConfig) {
-            segmentSpecificMap.set(segmentIndex, segmentSpecificConfig);
-        }
-        scalarToColorMap.set(segmentIndex, [
-            ...color,
-            segmentsHidden.has(segmentIndex) ? 0 : 255,
-        ]);
-        segmentIndex === 0
-            ? appendPolyData.setInputData(polyData)
-            : appendPolyData.addInputData(polyData);
-    });
-    const polyDataOutput = appendPolyData.getOutputData();
-    const outlineWidthActive = contourRepresentationConfig.representations.CONTOUR.outlineWidthActive;
-    const mapper = Mapper_1.default.newInstance();
-    mapper.setInputData(polyDataOutput);
-    const actor = Actor_1.default.newInstance();
-    actor.setMapper(mapper);
-    actor.getProperty().setLineWidth(outlineWidthActive);
-    (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, (0, contourConfigCache_1.getConfigCache)(segmentationRepresentationUID), {
-        segmentsHidden: new Set(segmentsHidden),
-        segmentSpecificMap,
-        outlineWidthActive,
-    }));
-    actor.setForceOpaque(true);
-    viewport.addActor({
-        uid: contourActorUID,
-        actor: actor,
-    });
-    viewport.resetCamera();
-    viewport.render();
-}
-exports.addContourSetsToElement = addContourSetsToElement;
-//# sourceMappingURL=addContourSetsToElement.js.map

package/dist/cjs/tools/displayTools/Contour/vtkContour/addContourSetsToElement.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"addContourSetsToElement.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/vtkContour/addContourSetsToElement.ts"],"names":[],"mappings":"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"}

package/dist/cjs/tools/displayTools/Contour/vtkContour/addOrUpdateVTKContourSets.d.ts

@@ -1,3 +0,0 @@
-import { Types } from '@cornerstonejs/core';
-import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../../types';
-export declare function addOrUpdateVTKContourSets(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig): void;

package/dist/cjs/tools/displayTools/Contour/vtkContour/addOrUpdateVTKContourSets.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addOrUpdateVTKContourSets = void 0;
-const addContourSetsToElement_1 = require("./addContourSetsToElement");
-const updateVTKContourSets_1 = require("./updateVTKContourSets");
-function addOrUpdateVTKContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig) {
-    const { segmentationRepresentationUID } = contourRepresentation;
-    const actorUID = `CONTOUR_${segmentationRepresentationUID}`;
-    const actor = viewport.getActor(actorUID);
-    const addOrUpdateFn = actor ? updateVTKContourSets_1.updateVTKContourSets : addContourSetsToElement_1.addContourSetsToElement;
-    addOrUpdateFn(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, actorUID);
-}
-exports.addOrUpdateVTKContourSets = addOrUpdateVTKContourSets;
-//# sourceMappingURL=addOrUpdateVTKContourSets.js.map

package/dist/cjs/tools/displayTools/Contour/vtkContour/addOrUpdateVTKContourSets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"addOrUpdateVTKContourSets.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/vtkContour/addOrUpdateVTKContourSets.ts"],"names":[],"mappings":";;;AAMA,uEAAoE;AACpE,iEAA8D;AAE9D,SAAgB,yBAAyB,CACvC,QAA+B,EAC/B,WAAqB,EACrB,qBAA6D,EAC7D,2BAA6D;IAE7D,MAAM,EAAE,6BAA6B,EAAE,GAAG,qBAAqB,CAAC;IAChE,MAAM,QAAQ,GAAG,WAAW,6BAA6B,EAAE,CAAC;IAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,2CAAoB,CAAC,CAAC,CAAC,iDAAuB,CAAC;IAC7E,aAAa,CACX,QAAQ,EACR,WAAW,EACX,qBAAqB,EACrB,2BAA2B,EAC3B,QAAQ,CACT,CAAC;AACJ,CAAC;AAlBD,8DAkBC"}

package/dist/cjs/tools/displayTools/Contour/vtkContour/contourConfigCache.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"contourConfigCache.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/vtkContour/contourConfigCache.ts"],"names":[],"mappings":";;;AAYA,MAAM,2CAA2C,GAAG,IAAI,GAAG,EAAE,CAAC;AAE9D,SAAgB,cAAc,CAC5B,6BAAqC;IAErC,OAAO,2CAA2C,CAAC,GAAG,CACpD,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAND,wCAMC;AAED,SAAgB,cAAc,CAC5B,6BAAqC,EACrC,MAAmB;IAEnB,2CAA2C,CAAC,GAAG,CAC7C,6BAA6B,EAC7B,MAAM,CACP,CAAC;AACJ,CAAC;AARD,wCAQC;AAED,SAAgB,iBAAiB,CAAC,6BAAqC;IACrE,2CAA2C,CAAC,MAAM,CAChD,6BAA6B,CAC9B,CAAC;AACJ,CAAC;AAJD,8CAIC"}

package/dist/cjs/tools/displayTools/Contour/vtkContour/updateVTKContourSets.d.ts

@@ -1,3 +0,0 @@
-import { Types } from '@cornerstonejs/core';
-import { SegmentationRepresentationConfig, ToolGroupSpecificContourRepresentation } from '../../../../types';
-export declare function updateVTKContourSets(viewport: Types.IVolumeViewport, geometryIds: string[], contourRepresentation: ToolGroupSpecificContourRepresentation, contourRepresentationConfig: SegmentationRepresentationConfig, contourActorUID: string): void;

package/dist/cjs/tools/displayTools/Contour/vtkContour/updateVTKContourSets.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateVTKContourSets = void 0;
-const core_1 = require("@cornerstonejs/core");
-const contourConfigCache_1 = require("./contourConfigCache");
-const utils_1 = require("./utils");
-function updateVTKContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, contourActorUID) {
-    const { segmentationRepresentationUID, segmentsHidden } = contourRepresentation;
-    const newContourConfig = contourRepresentationConfig.representations.CONTOUR;
-    const cachedConfig = (0, contourConfigCache_1.getConfigCache)(segmentationRepresentationUID);
-    const contourSetsActor = viewport.getActor(contourActorUID);
-    if (!contourSetsActor) {
-        console.warn(`No contour actor found for actorUID ${contourActorUID}. Skipping render.`);
-        return;
-    }
-    const { actor } = contourSetsActor;
-    const newOutlineWithActive = newContourConfig.outlineWidthActive;
-    if ((cachedConfig === null || cachedConfig === void 0 ? void 0 : cachedConfig.outlineWidthActive) !== newOutlineWithActive) {
-        actor
-            .getProperty()
-            .setLineWidth(newOutlineWithActive);
-        (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
-            outlineWidthActive: newOutlineWithActive,
-        }));
-    }
-    const mapper = actor.getMapper();
-    const lut = mapper.getLookupTable();
-    const segmentsToSetToInvisible = [];
-    const segmentsToSetToVisible = [];
-    for (const segmentIndex of segmentsHidden) {
-        if (!cachedConfig.segmentsHidden.has(segmentIndex)) {
-            segmentsToSetToInvisible.push(segmentIndex);
-        }
-    }
-    for (const segmentIndex of cachedConfig.segmentsHidden) {
-        if (!segmentsHidden.has(segmentIndex)) {
-            segmentsToSetToVisible.push(segmentIndex);
-        }
-    }
-    const mergedInvisibleSegments = Array.from(cachedConfig.segmentsHidden)
-        .filter((segmentIndex) => !segmentsToSetToVisible.includes(segmentIndex))
-        .concat(segmentsToSetToInvisible);
-    const { contourSets, segmentSpecificConfigs } = geometryIds.reduce((acc, geometryId) => {
-        const geometry = core_1.cache.getGeometry(geometryId);
-        const { data: contourSet } = geometry;
-        const segmentIndex = contourSet.getSegmentIndex();
-        const segmentSpecificConfig = (0, utils_1.getSegmentSpecificConfig)(contourRepresentation, geometryId, segmentIndex);
-        acc.contourSets.push(contourSet);
-        acc.segmentSpecificConfigs[segmentIndex] = segmentSpecificConfig !== null && segmentSpecificConfig !== void 0 ? segmentSpecificConfig : {};
-        return acc;
-    }, { contourSets: [], segmentSpecificConfigs: {} });
-    const affectedSegments = [
-        ...mergedInvisibleSegments,
-        ...segmentsToSetToVisible,
-    ];
-    const hasCustomSegmentSpecificConfig = Object.values(segmentSpecificConfigs).some((config) => Object.keys(config).length > 0);
-    let polyDataModified = false;
-    if (affectedSegments.length || hasCustomSegmentSpecificConfig) {
-        const appendPolyData = mapper.getInputData();
-        const appendScalars = appendPolyData.getPointData().getScalars();
-        const appendScalarsData = appendScalars.getData();
-        let offset = 0;
-        contourSets.forEach((contourSet) => {
-            var _a;
-            const segmentIndex = contourSet.getSegmentIndex();
-            const size = contourSet.getTotalNumberOfPoints();
-            if (affectedSegments.includes(segmentIndex) ||
-                ((_a = segmentSpecificConfigs[segmentIndex]) === null || _a === void 0 ? void 0 : _a.fillAlpha)) {
-                const color = contourSet.getColor();
-                let visibility = mergedInvisibleSegments.includes(segmentIndex)
-                    ? 0
-                    : 255;
-                const segmentConfig = segmentSpecificConfigs[segmentIndex];
-                if (segmentConfig.fillAlpha !== undefined) {
-                    visibility = segmentConfig.fillAlpha * 255;
-                }
-                for (let i = 0; i < size; ++i) {
-                    appendScalarsData[offset + i * 4] = color[0];
-                    appendScalarsData[offset + i * 4 + 1] = color[1];
-                    appendScalarsData[offset + i * 4 + 2] = color[2];
-                    appendScalarsData[offset + i * 4 + 3] = visibility;
-                }
-                polyDataModified = true;
-            }
-            offset = offset + size * 4;
-        });
-        if (polyDataModified) {
-            appendPolyData.modified();
-        }
-        (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
-            segmentsHidden: new Set(segmentsHidden),
-        }));
-        mapper.setLookupTable(lut);
-    }
-    viewport.render();
-}
-exports.updateVTKContourSets = updateVTKContourSets;
-//# sourceMappingURL=updateVTKContourSets.js.map

package/dist/cjs/tools/displayTools/Contour/vtkContour/updateVTKContourSets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateVTKContourSets.js","sourceRoot":"","sources":["../../../../../../src/tools/displayTools/Contour/vtkContour/updateVTKContourSets.ts"],"names":[],"mappings":"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"}