@cornerstonejs/tools 0.60.2 → 0.61.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/dist/cjs/stateManagement/segmentation/removeSegmentationsFromToolGroup.js +2 -1
  2. package/dist/cjs/stateManagement/segmentation/removeSegmentationsFromToolGroup.js.map +1 -1
  3. package/dist/cjs/tools/displayTools/Contour/contourConfig.js +3 -0
  4. package/dist/cjs/tools/displayTools/Contour/contourConfig.js.map +1 -1
  5. package/dist/cjs/tools/displayTools/Contour/contourDisplay.js +2 -0
  6. package/dist/cjs/tools/displayTools/Contour/contourDisplay.js.map +1 -1
  7. package/dist/cjs/tools/displayTools/Contour/updateContourSets.js +48 -30
  8. package/dist/cjs/tools/displayTools/Contour/updateContourSets.js.map +1 -1
  9. package/dist/cjs/tools/displayTools/Contour/utils.js.map +1 -1
  10. package/dist/cjs/types/ContourTypes.d.ts +3 -0
  11. package/dist/esm/stateManagement/segmentation/removeSegmentationsFromToolGroup.js +2 -1
  12. package/dist/esm/stateManagement/segmentation/removeSegmentationsFromToolGroup.js.map +1 -1
  13. package/dist/esm/tools/displayTools/Contour/contourConfig.js +3 -0
  14. package/dist/esm/tools/displayTools/Contour/contourConfig.js.map +1 -1
  15. package/dist/esm/tools/displayTools/Contour/contourDisplay.js +2 -0
  16. package/dist/esm/tools/displayTools/Contour/contourDisplay.js.map +1 -1
  17. package/dist/esm/tools/displayTools/Contour/updateContourSets.js +48 -28
  18. package/dist/esm/tools/displayTools/Contour/updateContourSets.js.map +1 -1
  19. package/dist/esm/tools/displayTools/Contour/utils.js.map +1 -1
  20. package/dist/esm/types/ContourTypes.d.ts +3 -0
  21. package/dist/umd/index.js +1 -1
  22. package/dist/umd/index.js.map +1 -1
  23. package/package.json +3 -3
  24. package/src/stateManagement/segmentation/removeSegmentationsFromToolGroup.ts +6 -1
  25. package/src/tools/displayTools/Contour/contourConfig.ts +3 -0
  26. package/src/tools/displayTools/Contour/contourDisplay.ts +3 -0
  27. package/src/tools/displayTools/Contour/updateContourSets.ts +70 -28
  28. package/src/tools/displayTools/Contour/utils.ts +0 -1
  29. package/src/types/ContourTypes.ts +6 -0
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const SegmentationRepresentations_1 = __importDefault(require("../../enums/SegmentationRepresentations"));
7
7
  const Labelmap_1 = require("../../tools/displayTools/Labelmap");
8
+ const Contour_1 = require("../../tools/displayTools/Contour");
8
9
  const segmentationState_1 = require("./segmentationState");
9
10
  function removeSegmentationsFromToolGroup(toolGroupId, segmentationRepresentationUIDs, immediate) {
10
11
  const toolGroupSegRepresentations = (0, segmentationState_1.getSegmentationRepresentations)(toolGroupId);
@@ -34,7 +35,7 @@ function _removeSegmentation(toolGroupId, segmentationRepresentationUID, immedia
34
35
  Labelmap_1.labelmapDisplay.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, immediate);
35
36
  }
36
37
  else if (type === SegmentationRepresentations_1.default.Contour) {
37
- console.debug('Contour representation is not supported yet, ignoring...');
38
+ Contour_1.contourDisplay.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, immediate);
38
39
  }
39
40
  else {
40
41
  throw new Error(`The representation ${type} is not supported yet`);
@@ -1 +1 @@
1
- {"version":3,"file":"removeSegmentationsFromToolGroup.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/removeSegmentationsFromToolGroup.ts"],"names":[],"mappings":";;;;;AAAA,0GAAkF;AAClF,gEAAoE;AAEpE,2DAG6B;AAQ7B,SAAS,gCAAgC,CACvC,WAAmB,EACnB,8BAAqD,EACrD,SAAmB;IAEnB,MAAM,2BAA2B,GAC/B,IAAA,kDAA8B,EAAC,WAAW,CAAC,CAAC;IAE9C,IACE,CAAC,2BAA2B;QAC5B,2BAA2B,CAAC,MAAM,KAAK,CAAC,EACxC;QACA,OAAO;KACR;IAED,MAAM,8BAA8B,GAAG,2BAA2B,CAAC,GAAG,CACpE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,6BAA6B,CACjE,CAAC;IAEF,IAAI,6BAA6B,GAAG,8BAA8B,CAAC;IACnE,IAAI,6BAA6B,EAAE;QAGjC,MAAM,4BAA4B,GAAG,8BAA8B,CAAC,MAAM,CACxE,CAAC,oBAAoB,EAAE,EAAE,CACvB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CACjE,CAAC;QAEF,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CACb,+EAA+E,IAAI,CAAC,SAAS,CAC3F,4BAA4B,CAC7B,EAAE,CACJ,CAAC;SACH;KACF;SAAM;QAEL,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;IAED,6BAA6B,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE;QAC5D,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,WAAmB,EACnB,6BAAqC,EACrC,SAAmB;IAEnB,MAAM,0BAA0B,GAAG,IAAA,sDAAkC,EACnE,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,0BAA0B,CAAC;IAE5C,IAAI,IAAI,KAAK,qCAA2B,CAAC,QAAQ,EAAE;QACjD,0BAAe,CAAC,gCAAgC,CAC9C,WAAW,EACX,6BAA6B,EAC7B,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,qCAA2B,CAAC,OAAO,EAAE;QACvD,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC3E;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,uBAAuB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,kBAAe,gCAAgC,CAAC"}
1
+ {"version":3,"file":"removeSegmentationsFromToolGroup.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/removeSegmentationsFromToolGroup.ts"],"names":[],"mappings":";;;;;AAAA,0GAAkF;AAClF,gEAAoE;AACpE,8DAAkE;AAElE,2DAG6B;AAQ7B,SAAS,gCAAgC,CACvC,WAAmB,EACnB,8BAAqD,EACrD,SAAmB;IAEnB,MAAM,2BAA2B,GAC/B,IAAA,kDAA8B,EAAC,WAAW,CAAC,CAAC;IAE9C,IACE,CAAC,2BAA2B;QAC5B,2BAA2B,CAAC,MAAM,KAAK,CAAC,EACxC;QACA,OAAO;KACR;IAED,MAAM,8BAA8B,GAAG,2BAA2B,CAAC,GAAG,CACpE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,6BAA6B,CACjE,CAAC;IAEF,IAAI,6BAA6B,GAAG,8BAA8B,CAAC;IACnE,IAAI,6BAA6B,EAAE;QAGjC,MAAM,4BAA4B,GAAG,8BAA8B,CAAC,MAAM,CACxE,CAAC,oBAAoB,EAAE,EAAE,CACvB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CACjE,CAAC;QAEF,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CACb,+EAA+E,IAAI,CAAC,SAAS,CAC3F,4BAA4B,CAC7B,EAAE,CACJ,CAAC;SACH;KACF;SAAM;QAEL,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;IAED,6BAA6B,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE;QAC5D,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,WAAmB,EACnB,6BAAqC,EACrC,SAAmB;IAEnB,MAAM,0BAA0B,GAAG,IAAA,sDAAkC,EACnE,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,0BAA0B,CAAC;IAE5C,IAAI,IAAI,KAAK,qCAA2B,CAAC,QAAQ,EAAE;QACjD,0BAAe,CAAC,gCAAgC,CAC9C,WAAW,EACX,6BAA6B,EAC7B,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,qCAA2B,CAAC,OAAO,EAAE;QACvD,wBAAc,CAAC,gCAAgC,CAC7C,WAAW,EACX,6BAA6B,EAC7B,SAAS,CACV,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,uBAAuB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,kBAAe,gCAAgC,CAAC"}
@@ -6,6 +6,9 @@ const defaultContourConfig = {
6
6
  outlineWidthInactive: 2,
7
7
  outlineOpacity: 1,
8
8
  outlineOpacityInactive: 0.85,
9
+ renderFill: true,
10
+ fillAlpha: 1,
11
+ fillAlphaInactive: 0,
9
12
  };
10
13
  function getDefaultContourConfig() {
11
14
  return defaultContourConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":";;AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;CAC7B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,kBAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":";;AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;IAC5B,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,CAAC;IACZ,iBAAiB,EAAE,CAAC;CACrB,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,kBAAe,uBAAuB,CAAC"}
@@ -42,6 +42,7 @@ const SegmentationState = __importStar(require("../../../stateManagement/segment
42
42
  const ToolGroupManager_1 = require("../../../store/ToolGroupManager");
43
43
  const addOrUpdateContourSets_1 = require("./addOrUpdateContourSets");
44
44
  const removeContourFromElement_1 = __importDefault(require("./removeContourFromElement"));
45
+ const contourConfigCache_1 = require("./contourConfigCache");
45
46
  function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
46
47
  return __awaiter(this, void 0, void 0, function* () {
47
48
  const { segmentationId } = representationInput;
@@ -76,6 +77,7 @@ function addSegmentationRepresentation(toolGroupId, representationInput, toolGro
76
77
  function removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, renderImmediate = false) {
77
78
  _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID);
78
79
  SegmentationState.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID);
80
+ (0, contourConfigCache_1.deleteConfigCache)(segmentationRepresentationUID);
79
81
  if (renderImmediate) {
80
82
  const viewportsInfo = (0, ToolGroupManager_1.getToolGroup)(toolGroupId).getViewportsInfo();
81
83
  viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
@@ -1 +1 @@
1
- {"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAI6B;AAE7B,6GAAyE;AACzE,oHAAsG;AACtG,2GAA6F;AAC7F,sEAA+D;AAM/D,qEAAkE;AAClE,0FAAkE;AAClE,6DAAyD;AAUzD,SAAe,6BAA6B,CAC1C,WAAmB,EACnB,mBAA8C,EAC9C,uBAA0D;;QAE1D,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAC;QAC/C,MAAM,6BAA6B,GAAG,gBAAO,CAAC,MAAM,EAAE,CAAC;QAEvD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAiB,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC;QACxB,MAAM,aAAa,GAAG,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,+BAA+B,GAAoC;YACvE,cAAc;YACd,6BAA6B;YAC7B,IAAI,EAAE,qCAAe,CAAC,OAAO;YAC7B,cAAc;YACd,aAAa;YACb,MAAM;YACN,wCAAwC,EAAE,EAAE;YAC5C,qBAAqB,EAAE,EAAE;YACzB,MAAM,EAAE,EAAE;SACX,CAAC;QAEF,IAAI,uBAAuB,EAAE;YAI3B,MAAM,sBAAsB,GAC1B,kBAAkB,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;YAC7D,MAAM,YAAY,GAAG,gBAAO,CAAC,SAAS,CACpC,sBAAsB,EACtB,uBAAuB,CACxB,CAAC;YACF,kBAAkB,CAAC,0BAA0B,CAAC,WAAW,EAAE;gBACzD,2BAA2B,EACzB,YAAY,CAAC,2BAA2B,IAAI,IAAI;gBAClD,eAAe,oBACV,YAAY,CAAC,eAAe,CAChC;aACF,CAAC,CAAC;SACJ;QACD,iBAAiB,CAAC,6BAA6B,CAC7C,WAAW,EACX,+BAA+B,CAChC,CAAC;QACF,OAAO,6BAA6B,CAAC;IACvC,CAAC;CAAA;AAYD,SAAS,gCAAgC,CACvC,WAAmB,EACnB,6BAAqC,EACrC,eAAe,GAAG,KAAK;IAEvB,oCAAoC,CAClC,WAAW,EACX,6BAA6B,CAC9B,CAAC;IACF,iBAAiB,CAAC,gCAAgC,CAChD,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,IAAA,sCAAiB,EAAC,6BAA6B,CAAC,CAAC;IAEjD,IAAI,eAAe,EAAE;QACnB,MAAM,aAAa,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACnE,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE,EAAE;YAC1D,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;YACF,cAAc,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAQD,SAAe,MAAM,CACnB,QAA+B,EAC/B,oBAAqD,EACrD,eAAiD;;QAEjD,MAAM,EAAE,cAAc,EAAE,GAAG,oBAAoB,CAAC;QAChD,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,YAAY,CAAC,kBAAkB,CAAC,qCAAe,CAAC,OAAO,CAAC,CAAC;QAC7E,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;QAEpC,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAA,EAAE;YACxB,OAAO,CAAC,IAAI,CACV,wCAAwC,cAAc,oBAAoB,CAC3E,CAAC;SACH;QAGD,IAAA,+CAAsB,EACpB,QAAQ,EACR,WAAW,EACX,oBAAoB,EACpB,eAAe,CAChB,CAAC;IACJ,CAAC;CAAA;AAED,SAAS,oCAAoC,CAC3C,WAAmB,EACnB,6BAAqC;IAErC,MAAM,SAAS,GAAG,IAAA,+BAAY,EAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,WAAW,iBAAiB,CAAC,CAAC;KAC7E;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAEpC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC;QACvD,MAAM,cAAc,GAAG,IAAA,6BAAsB,EAC3C,UAAU,EACV,iBAAiB,CAClB,CAAC;QACF,IAAA,kCAAwB,EACtB,cAAc,CAAC,QAAQ,CAAC,OAAO,EAC/B,6BAA6B,CAC9B,CAAC;KACH;AACH,CAAC;AAED,kBAAe;IACb,MAAM;IACN,6BAA6B;IAC7B,gCAAgC;CACjC,CAAC"}
@@ -1,12 +1,7 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.updateContourSets = void 0;
7
4
  const core_1 = require("@cornerstonejs/core");
8
- const DataArray_1 = __importDefault(require("@kitware/vtk.js/Common/Core/DataArray"));
9
- const AppendPolyData_1 = __importDefault(require("@kitware/vtk.js/Filters/General/AppendPolyData"));
10
5
  const contourConfigCache_1 = require("./contourConfigCache");
11
6
  const utils_1 = require("./utils");
12
7
  function updateContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, contourActorUID) {
@@ -31,7 +26,7 @@ function updateContourSets(viewport, geometryIds, contourRepresentation, contour
31
26
  const segmentsToSetToInvisible = [];
32
27
  const segmentsToSetToVisible = [];
33
28
  for (const segmentIndex of segmentsHidden) {
34
- if (!(cachedConfig === null || cachedConfig === void 0 ? void 0 : cachedConfig.segmentsHidden.has(segmentIndex))) {
29
+ if (!cachedConfig.segmentsHidden.has(segmentIndex)) {
35
30
  segmentsToSetToInvisible.push(segmentIndex);
36
31
  }
37
32
  }
@@ -40,33 +35,56 @@ function updateContourSets(viewport, geometryIds, contourRepresentation, contour
40
35
  segmentsToSetToVisible.push(segmentIndex);
41
36
  }
42
37
  }
43
- if (segmentsToSetToInvisible.length || segmentsToSetToVisible.length) {
44
- const appendPolyData = AppendPolyData_1.default.newInstance();
45
- geometryIds.forEach((geometryId) => {
46
- const geometry = core_1.cache.getGeometry(geometryId);
47
- const { data: contourSet } = geometry;
38
+ const mergedInvisibleSegments = Array.from(cachedConfig.segmentsHidden)
39
+ .filter((segmentIndex) => !segmentsToSetToVisible.includes(segmentIndex))
40
+ .concat(segmentsToSetToInvisible);
41
+ const { contourSets, segmentSpecificConfigs } = geometryIds.reduce((acc, geometryId) => {
42
+ const geometry = core_1.cache.getGeometry(geometryId);
43
+ const { data: contourSet } = geometry;
44
+ const segmentIndex = contourSet.getSegmentIndex();
45
+ const segmentSpecificConfig = (0, utils_1.getSegmentSpecificConfig)(contourRepresentation, geometryId, segmentIndex);
46
+ acc.contourSets.push(contourSet);
47
+ acc.segmentSpecificConfigs[segmentIndex] = segmentSpecificConfig !== null && segmentSpecificConfig !== void 0 ? segmentSpecificConfig : {};
48
+ return acc;
49
+ }, { contourSets: [], segmentSpecificConfigs: {} });
50
+ const affectedSegments = [
51
+ ...mergedInvisibleSegments,
52
+ ...segmentsToSetToVisible,
53
+ ];
54
+ const hasCustomSegmentSpecificConfig = Object.values(segmentSpecificConfigs).some((config) => Object.keys(config).length > 0);
55
+ let polyDataModified = false;
56
+ if (affectedSegments.length || hasCustomSegmentSpecificConfig) {
57
+ const appendPolyData = mapper.getInputData();
58
+ const appendScalars = appendPolyData.getPointData().getScalars();
59
+ const appendScalarsData = appendScalars.getData();
60
+ let offset = 0;
61
+ contourSets.forEach((contourSet) => {
62
+ var _a;
48
63
  const segmentIndex = contourSet.getSegmentIndex();
49
- const color = contourSet.getColor();
50
- const visibility = segmentsToSetToInvisible.includes(segmentIndex)
51
- ? 0
52
- : 255;
53
- const polyData = (0, utils_1.getPolyData)(contourSet);
54
- const size = polyData.getPoints().getNumberOfPoints();
55
- const scalars = DataArray_1.default.newInstance({
56
- size: size * 4,
57
- numberOfComponents: 4,
58
- dataType: 'Uint8Array',
59
- });
60
- for (let i = 0; i < size; ++i) {
61
- scalars.setTuple(i, [...color, visibility]);
64
+ const size = contourSet.getTotalNumberOfPoints();
65
+ if (affectedSegments.includes(segmentIndex) ||
66
+ ((_a = segmentSpecificConfigs[segmentIndex]) === null || _a === void 0 ? void 0 : _a.fillAlpha)) {
67
+ const color = contourSet.getColor();
68
+ let visibility = mergedInvisibleSegments.includes(segmentIndex)
69
+ ? 0
70
+ : 255;
71
+ const segmentConfig = segmentSpecificConfigs[segmentIndex];
72
+ if (segmentConfig.fillAlpha !== undefined) {
73
+ visibility = segmentConfig.fillAlpha * 255;
74
+ }
75
+ for (let i = 0; i < size; ++i) {
76
+ appendScalarsData[offset + i * 4] = color[0];
77
+ appendScalarsData[offset + i * 4 + 1] = color[1];
78
+ appendScalarsData[offset + i * 4 + 2] = color[2];
79
+ appendScalarsData[offset + i * 4 + 3] = visibility;
80
+ }
81
+ polyDataModified = true;
62
82
  }
63
- polyData.getPointData().setScalars(scalars);
64
- segmentIndex === 0
65
- ? appendPolyData.setInputData(polyData)
66
- : appendPolyData.addInputData(polyData);
83
+ offset = offset + size * 4;
67
84
  });
68
- const polyDataOutput = appendPolyData.getOutputData();
69
- mapper.setInputData(polyDataOutput);
85
+ if (polyDataModified) {
86
+ appendPolyData.modified();
87
+ }
70
88
  (0, contourConfigCache_1.setConfigCache)(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
71
89
  segmentsHidden: new Set(segmentsHidden),
72
90
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/utils.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmD;AACnD,sFAAiE;AAEjE,gFAA2D;AAC3D,yFAAoE;AAepE,SAAgB,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;;IAEb,IAAI,qBAAqB,GACvB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAnBD,4DAmBC;AAOD,SAAgB,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAnBD,4CAmBC;AAUD,SAAgB,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,mBAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,YAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,kBAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC;AA1CD,kCA0CC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/utils.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAmD;AACnD,sFAAiE;AACjE,gFAA2D;AAC3D,yFAAoE;AAepE,SAAgB,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;;IAEb,IAAI,qBAAqB,GACvB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,MAAA,qBAAqB,CAAC,qBAAqB,0CAAG,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAnBD,4DAmBC;AAOD,SAAgB,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,YAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAnBD,4CAmBC;AAUD,SAAgB,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,mBAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,YAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,kBAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC;AA1CD,kCA0CC"}
@@ -4,6 +4,9 @@ export declare type ContourConfig = {
4
4
  outlineOpacity?: number;
5
5
  outlineOpacityInactive?: number;
6
6
  renderOutline?: boolean;
7
+ renderFill?: boolean;
8
+ fillAlpha?: number;
9
+ fillAlphaInactive?: number;
7
10
  };
8
11
  export declare type ContourRenderingConfig = {};
9
12
  export declare type ContourSegmentationData = {
@@ -1,5 +1,6 @@
1
1
  import SegmentationRepresentations from '../../enums/SegmentationRepresentations';
2
2
  import { labelmapDisplay } from '../../tools/displayTools/Labelmap';
3
+ import { contourDisplay } from '../../tools/displayTools/Contour';
3
4
  import { getSegmentationRepresentations, getSegmentationRepresentationByUID, } from './segmentationState';
4
5
  function removeSegmentationsFromToolGroup(toolGroupId, segmentationRepresentationUIDs, immediate) {
5
6
  const toolGroupSegRepresentations = getSegmentationRepresentations(toolGroupId);
@@ -29,7 +30,7 @@ function _removeSegmentation(toolGroupId, segmentationRepresentationUID, immedia
29
30
  labelmapDisplay.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, immediate);
30
31
  }
31
32
  else if (type === SegmentationRepresentations.Contour) {
32
- console.debug('Contour representation is not supported yet, ignoring...');
33
+ contourDisplay.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, immediate);
33
34
  }
34
35
  else {
35
36
  throw new Error(`The representation ${type} is not supported yet`);
@@ -1 +1 @@
1
- {"version":3,"file":"removeSegmentationsFromToolGroup.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/removeSegmentationsFromToolGroup.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEpE,OAAO,EACL,8BAA8B,EAC9B,kCAAkC,GACnC,MAAM,qBAAqB,CAAC;AAQ7B,SAAS,gCAAgC,CACvC,WAAmB,EACnB,8BAAqD,EACrD,SAAmB;IAEnB,MAAM,2BAA2B,GAC/B,8BAA8B,CAAC,WAAW,CAAC,CAAC;IAE9C,IACE,CAAC,2BAA2B;QAC5B,2BAA2B,CAAC,MAAM,KAAK,CAAC,EACxC;QACA,OAAO;KACR;IAED,MAAM,8BAA8B,GAAG,2BAA2B,CAAC,GAAG,CACpE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,6BAA6B,CACjE,CAAC;IAEF,IAAI,6BAA6B,GAAG,8BAA8B,CAAC;IACnE,IAAI,6BAA6B,EAAE;QAGjC,MAAM,4BAA4B,GAAG,8BAA8B,CAAC,MAAM,CACxE,CAAC,oBAAoB,EAAE,EAAE,CACvB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CACjE,CAAC;QAEF,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CACb,+EAA+E,IAAI,CAAC,SAAS,CAC3F,4BAA4B,CAC7B,EAAE,CACJ,CAAC;SACH;KACF;SAAM;QAEL,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;IAED,6BAA6B,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE;QAC5D,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,WAAmB,EACnB,6BAAqC,EACrC,SAAmB;IAEnB,MAAM,0BAA0B,GAAG,kCAAkC,CACnE,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,0BAA0B,CAAC;IAE5C,IAAI,IAAI,KAAK,2BAA2B,CAAC,QAAQ,EAAE;QACjD,eAAe,CAAC,gCAAgC,CAC9C,WAAW,EACX,6BAA6B,EAC7B,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,2BAA2B,CAAC,OAAO,EAAE;QACvD,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC3E;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,uBAAuB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,eAAe,gCAAgC,CAAC"}
1
+ {"version":3,"file":"removeSegmentationsFromToolGroup.js","sourceRoot":"","sources":["../../../../src/stateManagement/segmentation/removeSegmentationsFromToolGroup.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EACL,8BAA8B,EAC9B,kCAAkC,GACnC,MAAM,qBAAqB,CAAC;AAQ7B,SAAS,gCAAgC,CACvC,WAAmB,EACnB,8BAAqD,EACrD,SAAmB;IAEnB,MAAM,2BAA2B,GAC/B,8BAA8B,CAAC,WAAW,CAAC,CAAC;IAE9C,IACE,CAAC,2BAA2B;QAC5B,2BAA2B,CAAC,MAAM,KAAK,CAAC,EACxC;QACA,OAAO;KACR;IAED,MAAM,8BAA8B,GAAG,2BAA2B,CAAC,GAAG,CACpE,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,6BAA6B,CACjE,CAAC;IAEF,IAAI,6BAA6B,GAAG,8BAA8B,CAAC;IACnE,IAAI,6BAA6B,EAAE;QAGjC,MAAM,4BAA4B,GAAG,8BAA8B,CAAC,MAAM,CACxE,CAAC,oBAAoB,EAAE,EAAE,CACvB,CAAC,8BAA8B,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CACjE,CAAC;QAEF,IAAI,4BAA4B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CACb,+EAA+E,IAAI,CAAC,SAAS,CAC3F,4BAA4B,CAC7B,EAAE,CACJ,CAAC;SACH;KACF;SAAM;QAEL,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;IAED,6BAA6B,CAAC,OAAO,CAAC,CAAC,mBAAmB,EAAE,EAAE;QAC5D,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,WAAmB,EACnB,6BAAqC,EACrC,SAAmB;IAEnB,MAAM,0BAA0B,GAAG,kCAAkC,CACnE,WAAW,EACX,6BAA6B,CAC9B,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,GAAG,0BAA0B,CAAC;IAE5C,IAAI,IAAI,KAAK,2BAA2B,CAAC,QAAQ,EAAE;QACjD,eAAe,CAAC,gCAAgC,CAC9C,WAAW,EACX,6BAA6B,EAC7B,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,2BAA2B,CAAC,OAAO,EAAE;QACvD,cAAc,CAAC,gCAAgC,CAC7C,WAAW,EACX,6BAA6B,EAC7B,SAAS,CACV,CAAC;KACH;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,uBAAuB,CAAC,CAAC;KACpE;AACH,CAAC;AAED,eAAe,gCAAgC,CAAC"}
@@ -4,6 +4,9 @@ const defaultContourConfig = {
4
4
  outlineWidthInactive: 2,
5
5
  outlineOpacity: 1,
6
6
  outlineOpacityInactive: 0.85,
7
+ renderFill: true,
8
+ fillAlpha: 1,
9
+ fillAlphaInactive: 0,
7
10
  };
8
11
  function getDefaultContourConfig() {
9
12
  return defaultContourConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;CAC7B,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,eAAe,uBAAuB,CAAC"}
1
+ {"version":3,"file":"contourConfig.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourConfig.ts"],"names":[],"mappings":"AAEA,MAAM,oBAAoB,GAAkB;IAC1C,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,CAAC;IACrB,oBAAoB,EAAE,CAAC;IACvB,cAAc,EAAE,CAAC;IACjB,sBAAsB,EAAE,IAAI;IAC5B,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,CAAC;IACZ,iBAAiB,EAAE,CAAC;CACrB,CAAC;AAEF,SAAS,uBAAuB;IAC9B,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,eAAe,uBAAuB,CAAC"}
@@ -5,6 +5,7 @@ import * as SegmentationState from '../../../stateManagement/segmentation/segmen
5
5
  import { getToolGroup } from '../../../store/ToolGroupManager';
6
6
  import { addOrUpdateContourSets } from './addOrUpdateContourSets';
7
7
  import removeContourFromElement from './removeContourFromElement';
8
+ import { deleteConfigCache } from './contourConfigCache';
8
9
  async function addSegmentationRepresentation(toolGroupId, representationInput, toolGroupSpecificConfig) {
9
10
  const { segmentationId } = representationInput;
10
11
  const segmentationRepresentationUID = csUtils.uuidv4();
@@ -39,6 +40,7 @@ async function addSegmentationRepresentation(toolGroupId, representationInput, t
39
40
  function removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID, renderImmediate = false) {
40
41
  _removeContourFromToolGroupViewports(toolGroupId, segmentationRepresentationUID);
41
42
  SegmentationState.removeSegmentationRepresentation(toolGroupId, segmentationRepresentationUID);
43
+ deleteConfigCache(segmentationRepresentationUID);
42
44
  if (renderImmediate) {
43
45
  const viewportsInfo = getToolGroup(toolGroupId).getViewportsInfo();
44
46
  viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
@@ -1 +1 @@
1
- {"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contourDisplay.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/contourDisplay.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,6 @@
1
1
  import { cache } from '@cornerstonejs/core';
2
- import vtkDataArray from '@kitware/vtk.js/Common/Core/DataArray';
3
- import vtkAppendPolyData from '@kitware/vtk.js/Filters/General/AppendPolyData';
4
2
  import { getConfigCache, setConfigCache } from './contourConfigCache';
5
- import { getPolyData } from './utils';
3
+ import { getSegmentSpecificConfig } from './utils';
6
4
  export function updateContourSets(viewport, geometryIds, contourRepresentation, contourRepresentationConfig, contourActorUID) {
7
5
  const { segmentationRepresentationUID, segmentsHidden } = contourRepresentation;
8
6
  const newContourConfig = contourRepresentationConfig.representations.CONTOUR;
@@ -25,7 +23,7 @@ export function updateContourSets(viewport, geometryIds, contourRepresentation,
25
23
  const segmentsToSetToInvisible = [];
26
24
  const segmentsToSetToVisible = [];
27
25
  for (const segmentIndex of segmentsHidden) {
28
- if (!cachedConfig?.segmentsHidden.has(segmentIndex)) {
26
+ if (!cachedConfig.segmentsHidden.has(segmentIndex)) {
29
27
  segmentsToSetToInvisible.push(segmentIndex);
30
28
  }
31
29
  }
@@ -34,33 +32,55 @@ export function updateContourSets(viewport, geometryIds, contourRepresentation,
34
32
  segmentsToSetToVisible.push(segmentIndex);
35
33
  }
36
34
  }
37
- if (segmentsToSetToInvisible.length || segmentsToSetToVisible.length) {
38
- const appendPolyData = vtkAppendPolyData.newInstance();
39
- geometryIds.forEach((geometryId) => {
40
- const geometry = cache.getGeometry(geometryId);
41
- const { data: contourSet } = geometry;
35
+ const mergedInvisibleSegments = Array.from(cachedConfig.segmentsHidden)
36
+ .filter((segmentIndex) => !segmentsToSetToVisible.includes(segmentIndex))
37
+ .concat(segmentsToSetToInvisible);
38
+ const { contourSets, segmentSpecificConfigs } = geometryIds.reduce((acc, geometryId) => {
39
+ const geometry = cache.getGeometry(geometryId);
40
+ const { data: contourSet } = geometry;
41
+ const segmentIndex = contourSet.getSegmentIndex();
42
+ const segmentSpecificConfig = getSegmentSpecificConfig(contourRepresentation, geometryId, segmentIndex);
43
+ acc.contourSets.push(contourSet);
44
+ acc.segmentSpecificConfigs[segmentIndex] = segmentSpecificConfig ?? {};
45
+ return acc;
46
+ }, { contourSets: [], segmentSpecificConfigs: {} });
47
+ const affectedSegments = [
48
+ ...mergedInvisibleSegments,
49
+ ...segmentsToSetToVisible,
50
+ ];
51
+ const hasCustomSegmentSpecificConfig = Object.values(segmentSpecificConfigs).some((config) => Object.keys(config).length > 0);
52
+ let polyDataModified = false;
53
+ if (affectedSegments.length || hasCustomSegmentSpecificConfig) {
54
+ const appendPolyData = mapper.getInputData();
55
+ const appendScalars = appendPolyData.getPointData().getScalars();
56
+ const appendScalarsData = appendScalars.getData();
57
+ let offset = 0;
58
+ contourSets.forEach((contourSet) => {
42
59
  const segmentIndex = contourSet.getSegmentIndex();
43
- const color = contourSet.getColor();
44
- const visibility = segmentsToSetToInvisible.includes(segmentIndex)
45
- ? 0
46
- : 255;
47
- const polyData = getPolyData(contourSet);
48
- const size = polyData.getPoints().getNumberOfPoints();
49
- const scalars = vtkDataArray.newInstance({
50
- size: size * 4,
51
- numberOfComponents: 4,
52
- dataType: 'Uint8Array',
53
- });
54
- for (let i = 0; i < size; ++i) {
55
- scalars.setTuple(i, [...color, visibility]);
60
+ const size = contourSet.getTotalNumberOfPoints();
61
+ if (affectedSegments.includes(segmentIndex) ||
62
+ segmentSpecificConfigs[segmentIndex]?.fillAlpha) {
63
+ const color = contourSet.getColor();
64
+ let visibility = mergedInvisibleSegments.includes(segmentIndex)
65
+ ? 0
66
+ : 255;
67
+ const segmentConfig = segmentSpecificConfigs[segmentIndex];
68
+ if (segmentConfig.fillAlpha !== undefined) {
69
+ visibility = segmentConfig.fillAlpha * 255;
70
+ }
71
+ for (let i = 0; i < size; ++i) {
72
+ appendScalarsData[offset + i * 4] = color[0];
73
+ appendScalarsData[offset + i * 4 + 1] = color[1];
74
+ appendScalarsData[offset + i * 4 + 2] = color[2];
75
+ appendScalarsData[offset + i * 4 + 3] = visibility;
76
+ }
77
+ polyDataModified = true;
56
78
  }
57
- polyData.getPointData().setScalars(scalars);
58
- segmentIndex === 0
59
- ? appendPolyData.setInputData(polyData)
60
- : appendPolyData.addInputData(polyData);
79
+ offset = offset + size * 4;
61
80
  });
62
- const polyDataOutput = appendPolyData.getOutputData();
63
- mapper.setInputData(polyDataOutput);
81
+ if (polyDataModified) {
82
+ appendPolyData.modified();
83
+ }
64
84
  setConfigCache(segmentationRepresentationUID, Object.assign({}, cachedConfig, {
65
85
  segmentsHidden: new Set(segmentsHidden),
66
86
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"updateContourSets.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/updateContourSets.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAS,MAAM,qBAAqB,CAAC;AACnD,OAAO,YAAY,MAAM,uCAAuC,CAAC;AAEjE,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,WAAW,MAAM,2CAA2C,CAAC;AAepE,MAAM,UAAU,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;IAEb,IAAI,qBAAqB,GACvB,qBAAqB,CAAC,qBAAqB,EAAE,CAAC,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,qBAAqB,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAUD,MAAM,UAAU,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/tools/displayTools/Contour/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAS,MAAM,qBAAqB,CAAC;AACnD,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,SAAS,MAAM,oCAAoC,CAAC;AAC3D,OAAO,WAAW,MAAM,2CAA2C,CAAC;AAepE,MAAM,UAAU,wBAAwB,CACtC,qBAA6D,EAC7D,SAAiB,EACjB,KAAa;IAEb,IAAI,qBAAqB,GACvB,qBAAqB,CAAC,qBAAqB,EAAE,CAAC,SAAS,CAAC,CAAC;IAE3D,IAAI,CAAC,qBAAqB,EAAE;QAE1B,qBAAqB;YACnB,qBAAqB,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,qBAAqB,CAAC,OAAO,CAAC;AACvC,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAAC,QAAyB;IACxD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;KACpE;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAE/B,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE;QAChD,MAAM,IAAI,KAAK,CACb,iBAAiB,QAAQ,CAAC,IAAI,+BAA+B,CAC9D,CAAC;KACH;IAED,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;QAClB,OAAO,CAAC,IAAI,CACV,oCAAoC,UAAU,oBAAoB,CACnE,CAAC;QACF,OAAO;KACR;AACH,CAAC;AAUD,MAAM,UAAU,WAAW,CAAC,UAA6B;IACvD,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;IAIzC,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,OAAuB,EAAE,EAAE;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAG/B,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAChC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,cAAc,GAAG,UAAU,CACnD,CAAC;QAGF,IAAI,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,aAAa,EAAE;YAC5C,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE/B,KAAK,CAAC,cAAc,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;QAExC,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;IAC7C,CAAC,CAAC,CAAC;IAGH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAG9B,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExB,OAAO,OAAO,CAAC;AACjB,CAAC"}
@@ -4,6 +4,9 @@ export declare type ContourConfig = {
4
4
  outlineOpacity?: number;
5
5
  outlineOpacityInactive?: number;
6
6
  renderOutline?: boolean;
7
+ renderFill?: boolean;
8
+ fillAlpha?: number;
9
+ fillAlphaInactive?: number;
7
10
  };
8
11
  export declare type ContourRenderingConfig = {};
9
12
  export declare type ContourSegmentationData = {