@ohif/app 3.12.0-beta.31 → 3.12.0-beta.32

package/dist/{9856.bundle.4a338f5f69c7082091e0.js → 9856.bundle.8e21e8c0322a0837862b.js}

@@ -3428,14 +3428,15 @@ function internalAddSegmentationRepresentation_internalAddSegmentationRepresenta
     };
     defaultSegmentationStateManager.addSegmentationRepresentation(viewportId, segmentationId, representationInput.type, renderingConfig);
     if (!getActiveSegmentIndex(segmentationId)) {
+        let firstSegmentIndex = 1;
         const segmentation = defaultSegmentationStateManager.getSegmentation(segmentationId);
         if (segmentation) {
             const segmentKeys = Object.keys(segmentation.segments);
             if (segmentKeys.length > 0) {
-                const firstSegmentIndex = segmentKeys.map((k) => Number(k)).sort()[0];
-                setActiveSegmentIndex(segmentationId, firstSegmentIndex);
+                firstSegmentIndex = segmentKeys.map((k) => Number(k)).sort()[0];
             }
         }
+        setActiveSegmentIndex(segmentationId, firstSegmentIndex);
     }
     if (representationInput.type === SegmentationRepresentations.Contour) {
         triggerAnnotationRenderForViewportIds([viewportId]);
@@ -6318,8 +6319,8 @@ var getOrCreateCanvas = __webpack_require__(30135);
 var VolumeViewport = __webpack_require__(94155);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/VolumeViewport3D.js
 var VolumeViewport3D = __webpack_require__(40893);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/BaseVolumeViewport.js
-var BaseVolumeViewport = __webpack_require__(46347);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/BaseVolumeViewport.js + 1 modules
+var BaseVolumeViewport = __webpack_require__(95205);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/StackViewport.js + 14 modules
 var StackViewport = __webpack_require__(79720);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/VideoViewport.js + 3 modules
@@ -6972,6 +6973,8 @@ function getViewportsWithVolumeId(volumeId) {
 /* harmony import */ var _utilities_drawing__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(473);
 /* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(7001);
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(58640);
+/* harmony import */ var _stateManagement_annotation_config_helpers__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(76712);
+
 
 
 
@@ -7488,9 +7491,10 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .Annotation
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,_stateManagement_annotation_config_helpers__WEBPACK_IMPORTED_MODULE_17__/* .getStyleProperty */ .h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_9__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_9__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }
@@ -10706,6 +10710,20 @@ function hasNaNValues(input) {
 }
 
 
+/***/ }),
+
+/***/ 39537:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (/* binding */ imageIdToURI)
+/* harmony export */ });
+function imageIdToURI(imageId) {
+    const colonIndex = imageId.indexOf(':');
+    return imageId.substring(colonIndex + 1);
+}
+
+
 /***/ }),
 
 /***/ 39848:

package/dist/{9892.bundle.eb768b852ed006b855ae.js → 9892.bundle.bdb6973617e0eab859cc.js}

@@ -1606,6 +1606,8 @@ fn main(
 /* harmony import */ var _utilities_getPixelValueUnits__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(40634);
 /* harmony import */ var _utilities_viewport_isViewportPreScaled__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(18990);
 /* harmony import */ var _utilities_math_basic__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(73262);
+/* harmony import */ var _stateManagement_annotation_config_helpers__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(76712);
+
 
 
 
@@ -1988,9 +1990,10 @@ class RectangleROITool extends _base__WEBPACK_IMPORTED_MODULE_0__/* .AnnotationT
                     activeHandleIndex !== undefined) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,_stateManagement_annotation_config_helpers__WEBPACK_IMPORTED_MODULE_20__/* .getStyleProperty */ .h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_8__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_8__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }
@@ -4255,6 +4258,7 @@ __webpack_require__.d(__webpack_exports__, {
   convertMapperToNotSharedMapper: () => (/* reexport */ createVolumeMapper/* convertMapperToNotSharedMapper */.h),
   createVolumeActor: () => (/* reexport */ createVolumeActor/* default */.A),
   eventTarget: () => (/* reexport */ eventTarget/* default */.A),
+  getConfiguration: () => (/* reexport */ init/* getConfiguration */.D0),
   getEnabledElement: () => (/* reexport */ getEnabledElement/* default */.Ay),
   getEnabledElementByIds: () => (/* reexport */ getEnabledElement/* getEnabledElementByIds */.b1),
   getEnabledElementByViewportId: () => (/* reexport */ getEnabledElement/* getEnabledElementByViewportId */.yj),
@@ -4270,7 +4274,7 @@ __webpack_require__.d(__webpack_exports__, {
   volumeLoader: () => (/* reexport */ volumeLoader)
 });
 
-// UNUSED EXPORTS: BaseRenderingEngine, ContextPoolRenderingEngine, EVENTS, ProgressiveRetrieveImages, RenderingEngine, StreamingDynamicImageVolume, StreamingImageVolume, Surface, TiledRenderingEngine, VideoViewport, Viewport, VolumeViewport3D, WSIViewport, canRenderFloatTextures, cornerstoneMeshLoader, cornerstoneStreamingDynamicImageVolumeLoader, cornerstoneStreamingImageVolumeLoader, createCanvas, createViewportElement, createVolumeMapper, geometryLoader, getConfiguration, getOrCreateCanvas, getShouldUseCPURendering, imageRetrievalPoolManager, init, isCornerstoneInitialized, peerImport, registerImageLoader, requestPoolManager, resetInitialization, resetUseCPURendering, setCanvasCreator, setConfiguration, setPreferSizeOverAccuracy, setUseCPURendering, setVolumesForViewports, version
+// UNUSED EXPORTS: BaseRenderingEngine, ContextPoolRenderingEngine, EVENTS, ProgressiveRetrieveImages, RenderingEngine, StreamingDynamicImageVolume, StreamingImageVolume, Surface, TiledRenderingEngine, VideoViewport, Viewport, VolumeViewport3D, WSIViewport, canRenderFloatTextures, cornerstoneMeshLoader, cornerstoneStreamingDynamicImageVolumeLoader, cornerstoneStreamingImageVolumeLoader, createCanvas, createViewportElement, createVolumeMapper, geometryLoader, getOrCreateCanvas, getShouldUseCPURendering, imageRetrievalPoolManager, init, isCornerstoneInitialized, peerImport, registerImageLoader, requestPoolManager, resetInitialization, resetUseCPURendering, setCanvasCreator, setConfiguration, setPreferSizeOverAccuracy, setUseCPURendering, setVolumesForViewports, version
 
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/enums/index.js + 1 modules
 var enums = __webpack_require__(71851);
@@ -4288,8 +4292,8 @@ var getOrCreateCanvas = __webpack_require__(30135);
 var VolumeViewport = __webpack_require__(94155);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/VolumeViewport3D.js
 var VolumeViewport3D = __webpack_require__(40893);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/BaseVolumeViewport.js
-var BaseVolumeViewport = __webpack_require__(46347);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/BaseVolumeViewport.js + 1 modules
+var BaseVolumeViewport = __webpack_require__(95205);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/StackViewport.js + 14 modules
 var StackViewport = __webpack_require__(79720);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/RenderingEngine/VideoViewport.js + 3 modules
@@ -6573,6 +6577,8 @@ const segmentationRenderingEngine = new SegmentationRenderingEngine();
 /* harmony import */ var _utilities_drawing__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(473);
 /* harmony import */ var _cursors_elementCursor__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(7001);
 /* harmony import */ var _utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(58640);
+/* harmony import */ var _stateManagement_annotation_config_helpers__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(76712);
+
 
 
 
@@ -7089,9 +7095,10 @@ class BidirectionalTool extends _base__WEBPACK_IMPORTED_MODULE_3__/* .Annotation
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,_stateManagement_annotation_config_helpers__WEBPACK_IMPORTED_MODULE_17__/* .getStyleProperty */ .h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_9__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    (0,_drawingSvg__WEBPACK_IMPORTED_MODULE_9__.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }
@@ -11402,6 +11409,21 @@ function hasNaNValues(input) {
 }
 
 
+/***/ }),
+
+/***/ 39537:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   A: () => (/* binding */ imageIdToURI)
+/* harmony export */ });
+function imageIdToURI(imageId) {
+    const colonIndex = imageId.indexOf(':');
+    return imageId.substring(colonIndex + 1);
+}
+
+
 /***/ }),
 
 /***/ 40133:
@@ -12857,14 +12879,15 @@ function internalAddSegmentationRepresentation(viewportId, representationInput)
     };
     _SegmentationStateManager__WEBPACK_IMPORTED_MODULE_5__/* .defaultSegmentationStateManager */ ._6.addSegmentationRepresentation(viewportId, segmentationId, representationInput.type, renderingConfig);
     if (!(0,_segmentIndex__WEBPACK_IMPORTED_MODULE_6__.getActiveSegmentIndex)(segmentationId)) {
+        let firstSegmentIndex = 1;
         const segmentation = _SegmentationStateManager__WEBPACK_IMPORTED_MODULE_5__/* .defaultSegmentationStateManager */ ._6.getSegmentation(segmentationId);
         if (segmentation) {
             const segmentKeys = Object.keys(segmentation.segments);
             if (segmentKeys.length > 0) {
-                const firstSegmentIndex = segmentKeys.map((k) => Number(k)).sort()[0];
-                (0,_segmentIndex__WEBPACK_IMPORTED_MODULE_6__.setActiveSegmentIndex)(segmentationId, firstSegmentIndex);
+                firstSegmentIndex = segmentKeys.map((k) => Number(k)).sort()[0];
             }
         }
+        (0,_segmentIndex__WEBPACK_IMPORTED_MODULE_6__.setActiveSegmentIndex)(segmentationId, firstSegmentIndex);
     }
     if (representationInput.type === _enums__WEBPACK_IMPORTED_MODULE_2__.SegmentationRepresentations.Contour) {
         (0,_utilities_triggerAnnotationRenderForViewportIds__WEBPACK_IMPORTED_MODULE_1__/* .triggerAnnotationRenderForViewportIds */ .t)([viewportId]);
@@ -19510,7 +19533,7 @@ var COLOR_LUT = __webpack_require__(93952);
 
 
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/version.js
-const version = '4.0.0';
+const version = '4.3.10';
 
 ;// ../../../node_modules/@cornerstonejs/tools/dist/esm/synchronizers/callbacks/cameraSyncCallback.js
 
@@ -25660,13 +25683,20 @@ class WindowLevelTool extends base/* BaseTool */.oS {
             }, [Infinity, -Infinity]);
             const BitsStored = imageVolume?.metadata?.BitsStored;
             const metadataDynamicRange = BitsStored ? 2 ** BitsStored : Infinity;
-            imageDynamicRange = Math.min(calculatedDynamicRange[1] - calculatedDynamicRange[0], metadataDynamicRange);
+            const calculatedRange = calculatedDynamicRange[1] - calculatedDynamicRange[0];
+            imageDynamicRange = !Number.isFinite(calculatedRange)
+                ? metadataDynamicRange
+                : Math.min(calculatedRange, metadataDynamicRange);
         }
         else {
             imageDynamicRange = this._getImageDynamicRangeFromViewport(viewport);
         }
         const ratio = imageDynamicRange / DEFAULT_IMAGE_DYNAMIC_RANGE;
-        return ratio > 1 ? Math.round(ratio) : ratio;
+        return !Number.isFinite(ratio)
+            ? DEFAULT_IMAGE_DYNAMIC_RANGE
+            : ratio > 1
+                ? Math.round(ratio)
+                : ratio;
     }
     _getImageDynamicRangeFromViewport(viewport) {
         const { imageData, voxelManager } = viewport.getImageData();
@@ -26093,6 +26123,7 @@ PlanarRotateTool.toolName = 'PlanarRotate';
 
 
 
+
 class ZoomTool extends base/* BaseTool */.oS {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -26151,9 +26182,13 @@ class ZoomTool extends base/* BaseTool */.oS {
                 const imageWidth = dimensions[0] * spacing[0];
                 const imageHeight = dimensions[1] * spacing[1];
                 const canvasAspect = size[0] / size[1];
+                const insetImageMultiplier = (0,esm.getConfiguration)().rendering
+                    ?.useLegacyCameraFOV
+                    ? 1.1
+                    : 1;
                 const displayArea = viewport.options?.displayArea;
-                const imageAreaScaleX = displayArea?.imageArea?.[0] ?? 1.1;
-                const imageAreaScaleY = displayArea?.imageArea?.[1] ?? 1.1;
+                const imageAreaScaleX = displayArea?.imageArea?.[0] ?? insetImageMultiplier;
+                const imageAreaScaleY = displayArea?.imageArea?.[1] ?? insetImageMultiplier;
                 const scaledImageWidth = imageWidth * imageAreaScaleX;
                 const scaledImageHeight = imageHeight * imageAreaScaleY;
                 const scaledImageAspect = scaledImageWidth / scaledImageHeight;
@@ -30949,6 +30984,7 @@ LabelTool.toolName = 'Label';
 
 
 
+
 const { transformWorldToIndex: LengthTool_transformWorldToIndex } = esm.utilities;
 class LengthTool extends base/* AnnotationTool */.EC {
     static { this.toolName = 'Length'; }
@@ -31206,7 +31242,8 @@ class LengthTool extends base/* AnnotationTool */.EC {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,
@@ -31393,6 +31430,7 @@ function defaultGetTextLines(data, targetId) {
 
 
 
+
 const { transformWorldToIndex: HeightTool_transformWorldToIndex } = esm.utilities;
 class HeightTool extends base/* AnnotationTool */.EC {
     static { this.toolName = 'Height'; }
@@ -31637,7 +31675,8 @@ class HeightTool extends base/* AnnotationTool */.EC {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,
@@ -32322,6 +32361,7 @@ var basic = __webpack_require__(73262);
 
 
 
+
 
 
 const { transformWorldToIndex: EllipticalROITool_transformWorldToIndex } = esm.utilities;
@@ -32749,9 +32789,10 @@ class EllipticalROITool extends base/* AnnotationTool */.EC {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }
@@ -33016,6 +33057,7 @@ function EllipticalROITool_defaultGetTextLines(data, targetId) {
 
 
 
+
 
 
 const { transformWorldToIndex: CircleROITool_transformWorldToIndex } = esm.utilities;
@@ -33407,9 +33449,10 @@ class CircleROITool extends base/* AnnotationTool */.EC {
                         activeHandleCanvasCoords = canvasCoordinates;
                     }
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }
@@ -35686,6 +35729,7 @@ class LivewireContourSegmentationTool extends annotation_LivewireContourTool {
 
 
 
+
 class ArrowAnnotateTool extends base/* AnnotationTool */.EC {
     static { this.toolName = 'ArrowAnnotate'; }
     constructor(toolProps = {}, defaultToolProps = {
@@ -35970,7 +36014,8 @@ class ArrowAnnotateTool extends base/* AnnotationTool */.EC {
                 if (!(0,annotationVisibility.isAnnotationVisible)(annotationUID)) {
                     continue;
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,
@@ -36122,6 +36167,7 @@ function ArrowAnnotateTool_changeTextCallback(data, eventData, doneChangingTextC
 
 
 
+
 class AngleTool extends base/* AnnotationTool */.EC {
     static { this.toolName = 'Angle'; }
     constructor(toolProps = {}, defaultToolProps = {
@@ -36404,7 +36450,8 @@ class AngleTool extends base/* AnnotationTool */.EC {
                 if (!(0,annotationVisibility.isAnnotationVisible)(annotationUID)) {
                     continue;
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,
@@ -36620,6 +36667,7 @@ var midPoint = __webpack_require__(82983);
 
 
 
+
 class CobbAngleTool extends base/* AnnotationTool */.EC {
     static { this.toolName = 'CobbAngle'; }
     constructor(toolProps = {}, defaultToolProps = {
@@ -36954,7 +37002,8 @@ class CobbAngleTool extends base/* AnnotationTool */.EC {
                 if (!(0,annotationVisibility.isAnnotationVisible)(annotationUID)) {
                     continue;
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean((0,helpers/* getStyleProperty */.h)('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     (0,drawingSvg.drawHandles)(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,