fix: update DICOMSR and Measurement Panel copy to use L/W (#2174)

* fix: update DICOMSR and Measurement Panel copy to use L/W

* functional viewport

* support the active viewport for snapshot

* Support empty viewport case

* bump cs-tools to pick up misc. fixes
This commit is contained in:
Danny Brown authored and GitHub committed 2020-11-18 00:14:52 -05:00
1 parent 0d9da69580
commit 2f4cba28a5
14 files changed
+52 -78

No files matched your search

@@ -281,7 +281,7 @@ const ViewportDownloadForm = ({
<Input
data-cy="file-name"
value={filename}
onChange={value => setFilename(value)}
onChange={evt => setFilename(evt.target.value)}
label="File Name"
/>
{renderErrorHandler('filename')}
@@ -296,7 +296,7 @@ const ViewportDownloadForm = ({
max={maximumSize}
label="Image width (px)"
value={dimensions.width}
onChange={value => onDimensionsChange(value, 'width')}
onChange={evt => onDimensionsChange(evt.target.value, 'width')}
data-cy="image-width"
/>
{renderErrorHandler('width')}
@@ -308,7 +308,7 @@ const ViewportDownloadForm = ({
max={maximumSize}
label="Image height (px)"
value={dimensions.height}
onChange={value => onDimensionsChange(value, 'height')}
onChange={evt => onDimensionsChange(evt.target.value, 'height')}
data-cy="image-height"
/>
{renderErrorHandler('height')}
@@ -371,44 +371,36 @@ const ViewportDownloadForm = ({
</div>
<div className="mt-8">
<div
className="hidden"
style={{
height: viewportElementDimensions.height,
width: viewportElementDimensions.width,
}}
ref={ref => setViewportElement(ref)}
>
<canvas
className={classnames('block', canvasClass)}
style={{
height: downloadCanvas.height,
width: downloadCanvas.width,
}}
width={downloadCanvas.width}
height={downloadCanvas.height}
ref={downloadCanvas.ref}
></canvas>
</div>
{viewportPreview.src ? (
<div
className="p-4 rounded bg-secondary-dark border-secondary-primary"
data-cy="image-preview"
>
<Typography variant="h5">Image preview</Typography>
<img
className="mt-4"
src={viewportPreview.src}
alt="Preview"
data-cy="image-preview"
/>
{activeViewport && (<div
className="mx-auto my-0"
style={{
height: viewportElementDimensions.height,
width: viewportElementDimensions.width,
}}
ref={ref => setViewportElement(ref)}
>
<canvas
className={classnames('block', canvasClass)}
style={{
height: downloadCanvas.height,
width: downloadCanvas.width,
}}
width={downloadCanvas.width}
height={downloadCanvas.height}
ref={downloadCanvas.ref}
></canvas>
</div>)}
{!activeViewport &&
<Typography className="mt-4">
Active viewport has no displayed image
</Typography>
}
</div>
) : (
<div className="p-8 text-center">
<Typography>Loading Image Preview...</Typography>
</div>
)}
</div>
<div className="flex justify-end mt-4">