diff --git a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.styled.ts b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.styled.ts index 06153d1..ac1c314 100644 --- a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.styled.ts +++ b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.styled.ts @@ -2,52 +2,56 @@ import { Dialog } from '@equinor/eds-core-react'; import styled from 'styled-components'; import { spacings } from '../../../../../../tokens/spacings'; -import { theme } from '../../../../../../tokens/theme'; - export const StyledDialog = styled(Dialog)` - width: fit-content; - max-width: 90vw; - max-height: 90vh; -`; - -export const Content = styled(Dialog.CustomContent)` - display: flex; - flex-direction: column; - - row-gap: ${spacings.SMALL}; -`; - -export { StyledDialog as Dialog }; + --image-width: 1500px; + --image-height: 1000px; + + width: min(var(--image-width), 90vw); + height: min(var(--image-height), 90vh); + grid-template-rows: auto 52px; + + .dialog-content { + display: flex; + flex-direction: column; + row-gap: ${spacings.SMALL}; + + .tabs { + display: flex; + flex-direction: column; + height: 100%; + } -export const ImageWrapper = styled.div` - display: flex; - flex-direction: column; - align-items: center; + .tabs-panels { + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + } - border-style: solid; - border-width: 1px; - border-color: ${theme.light.ui.background.medium}; + .tabs-panel { + align-self: center; + } - > h5 { - font-weight: normal; - padding: ${spacings.SMALL}; - } + .image-wrapper { + margin: 0; + } - > .image { - width: fit-content; - max-width: 80vw; - max-height: 70vh; - padding: ${spacings.SMALL}; + .image { + display: block; + width: 100%; + object-fit: contain; - @media (max-width: 1200px) { - width: fit-content; - max-width: 70vw; - max-height: 60vh; + /* Tweak the content height inside the dialog minus tabs, actions, padding, etc. */ + max-height: calc( + min(var(--image-height), 90vh) - + (16px + 48px + 16px + 16px + 52px + 16px) + ); } - @media (max-width: 800px) { - width: fit-content; - max-width: 60vw; - max-height: 50vh; + + .placeholder-text { + text-align: center; } } `; + +export { StyledDialog as Dialog }; diff --git a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx index 4d019a9..a4396ce 100644 --- a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx +++ b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx @@ -1,5 +1,11 @@ /* eslint-disable max-lines-per-function */ -import { Button, Dialog, Tabs } from '@equinor/eds-core-react'; +import { + Button, + CircularProgress, + Dialog, + Tabs, + Typography, +} from '@equinor/eds-core-react'; import { useQuery } from '@tanstack/react-query'; import { useState } from 'react'; import { getVariogramImage } from '../../../../../../api/custom/getImageById'; @@ -76,8 +82,8 @@ export const ImageResult = ({ return ( - - + + Variogram slice Spherical @@ -85,121 +91,205 @@ export const ImageResult = ({ General Exponential Exponential - - - {loadedVariogramSlicesImage.isLoading && <>Loading ...} + + + <> + {loadedVariogramSlicesImage.isLoading && ( + <> + + + )} - {loadedVariogramSlicesImage.data && ( - - Case results - - )} + {loadedVariogramSlicesImage.data && ( +
+ Variogram x/y/z slice +
+ )} +
- - {loadedSphericalImage && loadedSphericalImage.data ? ( - <> - {loadedSphericalImage.isLoading && <>Loading ...} - {loadedSphericalImage.data && ( - - Spherical - - )} - - ) : ( - <>No Spherical - )} + + <> + {loadedSphericalImage && loadedSphericalImage.data ? ( + <> + {loadedSphericalImage.isLoading && ( + <> + + + )} + {loadedSphericalImage.data && ( +
+ Spherical variogram (empirical and fitted) +
+ )} + + ) : ( +
+ + Spherical variogram model is not included in the result + +
+ )} +
- - {loadedGaussianImage && loadedGaussianImage.data ? ( - <> - {loadedGaussianImage.isLoading && <>Loading ...} - {loadedGaussianImage.data && ( - - Gaussian - - )} - - ) : ( - <>No Gaussian - )} + + <> + {loadedGaussianImage && loadedGaussianImage.data ? ( + <> + {loadedGaussianImage.isLoading && ( + <> + + + )} + {loadedGaussianImage.data && ( +
+ Gaussian variogram (empirical and fitted) +
+ )} + + ) : ( +
+ + Gaussian variogram model is not included in the result + +
+ )} +
- - {loadedGeneralExponentialImage && - loadedGeneralExponentialImage.data ? ( - <> - {loadedGeneralExponentialImage.isLoading && <>Loading ...} - {loadedGeneralExponentialImage.data && ( - - General Exponential - - )} - - ) : ( - <>No General Exponential - )} + + <> + {loadedGeneralExponentialImage && + loadedGeneralExponentialImage.data ? ( + <> + {loadedGeneralExponentialImage.isLoading && ( + <> + + + )} + {loadedGeneralExponentialImage.data && ( +
+ General Exponential variogram (empirical and fitted) +
+ )} + + ) : ( +
+ + General exponential variogram model is not included in the + result + +
+ )} +
- - {loadedExponentialImage && loadedExponentialImage.data ? ( - <> - {loadedExponentialImage.isLoading && <>Loading ...} - {loadedExponentialImage.data && ( - - Exponential - - )} - - ) : ( - <>No General Exponential - )} + + <> + {loadedExponentialImage && loadedExponentialImage.data ? ( + <> + {loadedExponentialImage.isLoading && ( + <> + + + )} + {loadedExponentialImage.data && ( +
+ Exponential variogram (empirical and fitted) +
+ )} + + ) : ( +
+ + Exponential variogram model is not included in the result + +
+ )} +
-
+ -