Merge pull request #140 from PaulHax/save-roi

feat(LayerEntry): add save roi button
InsightSoftwareConsortium · Dec 4, 2023 · f5c4a6f · f5c4a6f
2 parents ae53133 + 7688b5b
commit f5c4a6f
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "classnames": "^2.3.1",
     "husky": "^7.0.4",
     "itk-viewer-color-maps": "^1.2.0",
-    "itk-viewer-icons": "^11.14.0",
+    "@itk-viewer/icons": "^11.14.1",
     "itk-viewer-transfer-function-editor": "^1.2.2",
     "prettier": "^2.5.0",
     "pydata_sphinx_theme": "github:pydata/pydata-sphinx-theme#2d9c495",

diff --git a/src/AppToolbar.jsx b/src/AppToolbar.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { toggleIconDataUri } from 'itk-viewer-icons'
+import { toggleIconDataUri } from '@itk-viewer/icons'
 import toggleUICollapsed from './toggleUICollapsed'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'

diff --git a/src/Images/BlendModeSelector.jsx b/src/Images/BlendModeSelector.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react'
 import { useSelector } from '@xstate/react'
-import { blendModeIconDataUri } from 'itk-viewer-icons'
+import { blendModeIconDataUri } from '@itk-viewer/icons'
 import applyContrastSensitiveStyleToElement from '../applyContrastSensitiveStyleToElement'
 import Image from 'react-bootstrap/Image'
 import Form from 'react-bootstrap/Form'

diff --git a/src/Images/CinematicParameters.jsx b/src/Images/CinematicParameters.jsx
@@ -3,7 +3,7 @@ import { useSelector } from '@xstate/react'
 import getSelectedImageContext from './getSelectedImageContext'
 import Form from 'react-bootstrap/Form'
 import { Image, OverlayTrigger, Tooltip } from 'react-bootstrap'
-import { volumeScatteringIconDataUri } from 'itk-viewer-icons'
+import { volumeScatteringIconDataUri } from '@itk-viewer/icons'
 
 function CinematicParameters({ service }) {
   const scatteringBlend = useSelector(service, (state) => {

diff --git a/src/Images/ColorRangeInput.jsx b/src/Images/ColorRangeInput.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { useSelector } from '@xstate/react'
-import { interpolationIconDataUri } from 'itk-viewer-icons'
+import { interpolationIconDataUri } from '@itk-viewer/icons'
 import ColorMapIconSelector from './ColorMapIconSelector'
 import WindowLevelReset from './WindowLevelReset'
 import '../style.css'

diff --git a/src/Images/GradientOpacitySlider.jsx b/src/Images/GradientOpacitySlider.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { useSelector } from '@xstate/react'
-import { gradientIconDataUri } from 'itk-viewer-icons'
+import { gradientIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Form from 'react-bootstrap/Form'
 import Image from 'react-bootstrap/Image'

diff --git a/src/Images/LabelImageColorWidget.jsx b/src/Images/LabelImageColorWidget.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef } from 'react'
 import { useSelector } from '@xstate/react'
 import CategoricalIconSelector from './CategoricalIconSelector'
-import { opacityIconDataUri } from 'itk-viewer-icons'
+import { opacityIconDataUri } from '@itk-viewer/icons'
 import Form from 'react-bootstrap/Form'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Images/SampleDistanceSlider.jsx b/src/Images/SampleDistanceSlider.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react'
 import { useSelector } from '@xstate/react'
-import { sampleDistanceIconDataUri } from 'itk-viewer-icons'
+import { sampleDistanceIconDataUri } from '@itk-viewer/icons'
 import applyContrastSensitiveStyleToElement from '../applyContrastSensitiveStyleToElement'
 import '../style.css'
 import Form from 'react-bootstrap/Form'

diff --git a/src/Images/ScaleSelector.jsx b/src/Images/ScaleSelector.jsx
@@ -3,7 +3,7 @@ import { useSelector } from '@xstate/react'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 import Image from 'react-bootstrap/Image'
-import { scaleSelectIconDataUri } from 'itk-viewer-icons'
+import { scaleSelectIconDataUri } from '@itk-viewer/icons'
 import { Form } from 'react-bootstrap'
 import getSelectedImageContext from './getSelectedImageContext'
 

diff --git a/src/Images/ShadowToggle.jsx b/src/Images/ShadowToggle.jsx
@@ -5,7 +5,7 @@ import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 import cn from 'classnames'
-import { shadowIconDataUri } from 'itk-viewer-icons'
+import { shadowIconDataUri } from '@itk-viewer/icons'
 import applyContrastSensitiveStyleToElement from '../applyContrastSensitiveStyleToElement'
 import '../style.css'
 

diff --git a/src/Images/WindowLevelReset.jsx b/src/Images/WindowLevelReset.jsx
@@ -4,7 +4,7 @@ import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
-import { resetImageIconDataUri } from 'itk-viewer-icons'
+import { resetImageIconDataUri } from '@itk-viewer/icons'
 import applyContrastSensitiveStyleToElement from '../applyContrastSensitiveStyleToElement'
 import '../style.css'
 
@@ -27,8 +27,8 @@ function WindowLevelReset(props) {
     send({
       type: 'IMAGE_COLOR_RANGE_RESET',
       data: {
-        name: stateContext.images.selectedName,
-      },
+        name: stateContext.images.selectedName
+      }
     })
   }
 

diff --git a/src/Images/WindowLevelToggle.jsx b/src/Images/WindowLevelToggle.jsx
@@ -5,7 +5,7 @@ import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 import cn from 'classnames'
-import { windowingIconDataUri } from 'itk-viewer-icons'
+import { windowingIconDataUri } from '@itk-viewer/icons'
 import applyContrastSensitiveStyleToElement from '../applyContrastSensitiveStyleToElement'
 import '../style.css'
 import getSelectedImageContext from './getSelectedImageContext'
@@ -34,16 +34,17 @@ function WindowLevelToggle(props) {
       'invertibleButton',
       toggleWindowingButton.current
     )
-    stateContext.images.toggleWindowingButtonInput = toggleWindowingButton.current
+    stateContext.images.toggleWindowingButtonInput =
+      toggleWindowingButton.current
   }, [])
 
   const toggleWindowing = () => {
     send({
       type: 'WINDOW_LEVEL_TOGGLED',
       data: {
         name,
-        component: actorContext.selectedComponent,
-      },
+        component: actorContext.selectedComponent
+      }
     })
   }
 

diff --git a/src/Layers/CompareControls.jsx b/src/Layers/CompareControls.jsx
@@ -7,7 +7,7 @@ import {
   rotateIconDataUri,
   playIconDataUri,
   pauseIconDataUri
-} from 'itk-viewer-icons'
+} from '@itk-viewer/icons'
 
 const xyz = ['X', 'Y', 'Z']
 

diff --git a/src/Layers/LayerEntry.jsx b/src/Layers/LayerEntry.jsx
@@ -10,8 +10,9 @@ import {
   imageIconDataUri,
   labelsIconDataUri,
   toggleIconDataUri,
-  boundingBoxIconDataUri
-} from 'itk-viewer-icons'
+  boundingBoxIconDataUri,
+  downloadIconDataUri
+} from '@itk-viewer/icons'
 import '../style.css'
 import { Button, Dropdown } from 'react-bootstrap'
 import cn from 'classnames'
@@ -161,6 +162,11 @@ function LayerEntry({ service, name, actor, fillRow }) {
     service,
     (state) => state.context.images.selectedName
   )
+  const showSaveRoiButton = useSelector(
+    service,
+    (state) => state.context.layers.showSaveRoiButton
+  )
+
   const layerEntry = useRef(null)
 
   useEffect(() => {
@@ -212,8 +218,35 @@ function LayerEntry({ service, name, actor, fillRow }) {
         </Button>
       </OverlayTrigger>
       <div className="layerLabelCommon"> {name} </div>
+
       <div className="layerIconGroup">
         <Spinner name={name} service={service} />
+
+        {showSaveRoiButton && (
+          <OverlayTrigger
+            transition={false}
+            overlay={<Tooltip>{'Save Image'}</Tooltip>}
+          >
+            <Button
+              onClick={() => {
+                send({
+                  type: 'DOWNLOAD_IMAGE',
+                  data: {
+                    name: selectedName,
+                    layerName: name
+                  }
+                })
+              }}
+              variant="secondary"
+              className={cn(`icon-button`, {
+                checked: actorContext.bbox
+              })}
+            >
+              <Image src={downloadIconDataUri}></Image>
+            </Button>
+          </OverlayTrigger>
+        )}
+
         <OverlayTrigger
           transition={false}
           overlay={<Tooltip>{BOUNDING_BOX_TEXT}</Tooltip>}

diff --git a/src/Main/AnnotationsButton.jsx b/src/Main/AnnotationsButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { annotationsIconDataUri } from 'itk-viewer-icons'
+import { annotationsIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/AxesButton.jsx b/src/Main/AxesButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { axesIconDataUri } from 'itk-viewer-icons'
+import { axesIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/BackgroundColorButton.jsx b/src/Main/BackgroundColorButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { selectColorIconDataUri } from 'itk-viewer-icons'
+import { selectColorIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/CroppingPlanesReset.jsx b/src/Main/CroppingPlanesReset.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { resetCropIconDataUri } from 'itk-viewer-icons'
+import { resetCropIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/CroppingPlanesToggle.jsx b/src/Main/CroppingPlanesToggle.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { cropIconDataUri } from 'itk-viewer-icons'
+import { cropIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/FullscreenButton.jsx b/src/Main/FullscreenButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { fullscreenIconDataUri } from 'itk-viewer-icons'
+import { fullscreenIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/PlaneSliders.jsx b/src/Main/PlaneSliders.jsx
@@ -5,7 +5,7 @@ import {
   invisibleIconDataUri,
   pauseIconDataUri,
   playIconDataUri
-} from 'itk-viewer-icons'
+} from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Form from 'react-bootstrap/Form'
 import Image from 'react-bootstrap/Image'

diff --git a/src/Main/ResetCameraButton.jsx b/src/Main/ResetCameraButton.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { resetCameraIconDataUri } from 'itk-viewer-icons'
+import { resetCameraIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/RotateButton.jsx b/src/Main/RotateButton.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { rotateIconDataUri } from 'itk-viewer-icons'
+import { rotateIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/ScreenshotButton.jsx b/src/Main/ScreenshotButton.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { screenshotIconDataUri } from 'itk-viewer-icons'
+import { screenshotIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/ViewModeButtons.jsx b/src/Main/ViewModeButtons.jsx
@@ -5,7 +5,7 @@ import {
   redPlaneIconDataUri,
   yellowPlaneIconDataUri,
   greenPlaneIconDataUri
-} from 'itk-viewer-icons'
+} from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Main/ViewPlanesToggle.jsx b/src/Main/ViewPlanesToggle.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useSelector } from '@xstate/react'
-import { viewPlanesIconDataUri } from 'itk-viewer-icons'
+import { viewPlanesIconDataUri } from '@itk-viewer/icons'
 import Button from 'react-bootstrap/Button'
 import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'

diff --git a/src/Widgets/DistanceWidget.jsx b/src/Widgets/DistanceWidget.jsx
@@ -5,7 +5,7 @@ import Image from 'react-bootstrap/Image'
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger'
 import Tooltip from 'react-bootstrap/Tooltip'
 import Form from 'react-bootstrap/Form'
-import { lengthToolIconDataUri } from 'itk-viewer-icons'
+import { lengthToolIconDataUri } from '@itk-viewer/icons'
 import applyContrastSensitiveStyleToElement from '../applyContrastSensitiveStyleToElement'
 import '../style.css'
 import cn from 'classnames'