diff --git a/src/api/custom/getImageById.ts b/src/api/custom/getImageById.ts new file mode 100644 index 00000000..3c29d281 --- /dev/null +++ b/src/api/custom/getImageById.ts @@ -0,0 +1,21 @@ +import axios from 'axios'; +import { OpenAPI } from '../generated'; + +export const getVariogramImage = async (imageId: string): Promise => { + const token = OpenAPI.TOKEN; // replace with your bearer token + const base = OpenAPI.BASE; + + try { + const response = await axios.get(`/api/images/variogram/${imageId}`, { + headers: { Authorization: `Bearer ${token}` }, + responseType: 'blob', // response type of blob to handle images + baseURL: base, + }); + + // create an object URL for the image blob and return it + return URL.createObjectURL(response.data); + } catch (error) { + console.error(`Error fetching image: ${error}`); + throw error; // re-throw the error so it can be handled by the caller + } +}; diff --git a/src/api/generated/index.ts b/src/api/generated/index.ts index f4534f59..92d95069 100644 --- a/src/api/generated/index.ts +++ b/src/api/generated/index.ts @@ -23,35 +23,20 @@ export type { AddAnalogueResponseDto } from './models/AddAnalogueResponseDto'; export type { AddMetadataDto } from './models/AddMetadataDto'; export type { AddMetadataResponseDto } from './models/AddMetadataResponseDto'; export type { AddParameterDto } from './models/AddParameterDto'; -export type { Analogue } from './models/Analogue'; export type { AnalogueList } from './models/AnalogueList'; -export type { AnalogueModel } from './models/AnalogueModel'; export type { AnalogueModelDetail } from './models/AnalogueModelDetail'; export type { AnalogueModelList } from './models/AnalogueModelList'; -export type { AnalogueModelMetadata } from './models/AnalogueModelMetadata'; -export type { AnalogueModelParameter } from './models/AnalogueModelParameter'; export { AnalogueModelSourceType } from './models/AnalogueModelSourceType'; export type { ChannelEstimationResultDto } from './models/ChannelEstimationResultDto'; export type { ChannelHeightDto } from './models/ChannelHeightDto'; -export type { ChannelResult } from './models/ChannelResult'; -export type { ChannelResultFile } from './models/ChannelResultFile'; -export type { ComputeCase } from './models/ComputeCase'; export type { ComputeCaseComputeMethodDto } from './models/ComputeCaseComputeMethodDto'; export type { ComputeCaseDto } from './models/ComputeCaseDto'; export type { ComputeCaseInputSettingsDto } from './models/ComputeCaseInputSettingsDto'; -export type { ComputeCaseInputValue } from './models/ComputeCaseInputValue'; export type { ComputeCaseModelAreaDto } from './models/ComputeCaseModelAreaDto'; -export type { ComputeJob } from './models/ComputeJob'; export { ComputeJobStatus } from './models/ComputeJobStatus'; -export type { ComputeMethod } from './models/ComputeMethod'; -export type { ComputeMethodInputType } from './models/ComputeMethodInputType'; export { ComputeType } from './models/ComputeType'; export type { ConvertAnalogueModelCommand } from './models/ConvertAnalogueModelCommand'; -export type { Coordinate } from './models/Coordinate'; export type { CoordinateDto } from './models/CoordinateDto'; -export type { CoordinateEqualityComparer } from './models/CoordinateEqualityComparer'; -export type { CoordinateSequence } from './models/CoordinateSequence'; -export type { CoordinateSequenceFactory } from './models/CoordinateSequenceFactory'; export type { CreateAnalogueCommand } from './models/CreateAnalogueCommand'; export type { CreateAnalogueCommandResponse } from './models/CreateAnalogueCommandResponse'; export type { CreateAnalogueDto } from './models/CreateAnalogueDto'; @@ -63,15 +48,9 @@ export type { CreateComputeCaseCommandResponse } from './models/CreateComputeCas export type { CreateComputeCaseInputSettingsForm } from './models/CreateComputeCaseInputSettingsForm'; export type { CreateMetadataCommandForm } from './models/CreateMetadataCommandForm'; export type { CreateParameterCommand } from './models/CreateParameterCommand'; -export { Dimension } from './models/Dimension'; -export type { Envelope } from './models/Envelope'; export type { ErrorResponse } from './models/ErrorResponse'; export type { EstimateChannelCommand } from './models/EstimateChannelCommand'; export type { EstimateVariogramCommand } from './models/EstimateVariogramCommand'; -export { FileType } from './models/FileType'; -export type { Geometry } from './models/Geometry'; -export type { GeometryFactory } from './models/GeometryFactory'; -export type { GeometryOverlay } from './models/GeometryOverlay'; export type { GetAnalogueListQueryResponse } from './models/GetAnalogueListQueryResponse'; export type { GetAnalogueModelListQueryResponse } from './models/GetAnalogueModelListQueryResponse'; export type { GetAnalogueModelQueryResponse } from './models/GetAnalogueModelQueryResponse'; @@ -89,9 +68,7 @@ export type { GetUploadDetailQueryResponse } from './models/GetUploadDetailQuery export type { GetUploadListQueryResponse } from './models/GetUploadListQueryResponse'; export type { GetVariogramResultsByModelIdQueryResponse } from './models/GetVariogramResultsByModelIdQueryResponse'; export type { GetVariogramResultsDto } from './models/GetVariogramResultsDto'; -export type { InputSettingType } from './models/InputSettingType'; -export type { InputSettingValue } from './models/InputSettingValue'; -export type { Job } from './models/Job'; +export type { GetVariogramResultsVariogramResultFileDto } from './models/GetVariogramResultsVariogramResultFileDto'; export type { JobDetail } from './models/JobDetail'; export type { JobList } from './models/JobList'; export type { JobListUploadsDto } from './models/JobListUploadsDto'; @@ -107,30 +84,18 @@ export type { ListMetadataTypesQueryResponse } from './models/ListMetadataTypesQ export type { ListModelAreaTypesQueryResponse } from './models/ListModelAreaTypesQueryResponse'; export type { MergeModelCommandResponse } from './models/MergeModelCommandResponse'; export type { MergeModelDto } from './models/MergeModelDto'; -export type { Metadata } from './models/Metadata'; export type { MetadataDto } from './models/MetadataDto'; -export { MetadataSourceType } from './models/MetadataSourceType'; -export type { MetadataType } from './models/MetadataType'; export type { MetadataTypeDto } from './models/MetadataTypeDto'; -export type { ModelArea } from './models/ModelArea'; export type { ModelAreaDto } from './models/ModelAreaDto'; -export type { ModelAreaType } from './models/ModelAreaType'; export type { ModelAreaTypeDto } from './models/ModelAreaTypeDto'; -export type { NtsGeometryServices } from './models/NtsGeometryServices'; -export { OgcGeometryType } from './models/OgcGeometryType'; export type { Operation } from './models/Operation'; export { OperationType } from './models/OperationType'; -export { Ordinates } from './models/Ordinates'; -export type { Parameter } from './models/Parameter'; export type { ParameterDetail } from './models/ParameterDetail'; export type { ParameterList } from './models/ParameterList'; export type { PatchAnalogueModelCommandResponse } from './models/PatchAnalogueModelCommandResponse'; export type { PatchAnalogueModelDto } from './models/PatchAnalogueModelDto'; export type { PatchParameterCommandResponse } from './models/PatchParameterCommandResponse'; export type { PatchParameterDto } from './models/PatchParameterDto'; -export type { Point } from './models/Point'; -export type { PrecisionModel } from './models/PrecisionModel'; -export { PrecisionModels } from './models/PrecisionModels'; export type { PrepareChunkedUploadCommandResponse } from './models/PrepareChunkedUploadCommandResponse'; export type { PrepareChunkedUploadDto } from './models/PrepareChunkedUploadDto'; export type { RadixJobDto } from './models/RadixJobDto'; @@ -150,7 +115,6 @@ export type { UpdateParameterCommandBody } from './models/UpdateParameterCommand export type { UpdateParameterCommandResponse } from './models/UpdateParameterCommandResponse'; export type { UpdateParameterDto } from './models/UpdateParameterDto'; export type { UpdateVariogramEstimationStatusCommand } from './models/UpdateVariogramEstimationStatusCommand'; -export type { Upload } from './models/Upload'; export type { UploadAnalogueModelCommandResponse } from './models/UploadAnalogueModelCommandResponse'; export type { UploadAnalogueModelDto } from './models/UploadAnalogueModelDto'; export type { UploadChunkCommandResponse } from './models/UploadChunkCommandResponse'; @@ -159,8 +123,6 @@ export { UploadFileCategory } from './models/UploadFileCategory'; export { UploadFileType } from './models/UploadFileType'; export type { UploadList } from './models/UploadList'; export { UploadStatus } from './models/UploadStatus'; -export type { VariogramResult } from './models/VariogramResult'; -export type { VariogramResultFile } from './models/VariogramResultFile'; export { AnalogueModelAnaloguesService } from './services/AnalogueModelAnaloguesService'; export { AnalogueModelComputeCasesService } from './services/AnalogueModelComputeCasesService'; @@ -169,6 +131,7 @@ export { AnalogueModelParametersService } from './services/AnalogueModelParamete export { AnalogueModelsService } from './services/AnalogueModelsService'; export { AnaloguesService } from './services/AnaloguesService'; export { ComputeSettingsService } from './services/ComputeSettingsService'; +export { ImagesService } from './services/ImagesService'; export { JobsService } from './services/JobsService'; export { MetadataService } from './services/MetadataService'; export { MetadataTypeService } from './services/MetadataTypeService'; diff --git a/src/api/generated/models/Analogue.ts b/src/api/generated/models/Analogue.ts deleted file mode 100644 index 0a0832ac..00000000 --- a/src/api/generated/models/Analogue.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; - -export type Analogue = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - analogueId?: string; - name?: string | null; - description?: string | null; - analogueModels?: Array | null; -}; - diff --git a/src/api/generated/models/AnalogueModel.ts b/src/api/generated/models/AnalogueModel.ts deleted file mode 100644 index 20933e89..00000000 --- a/src/api/generated/models/AnalogueModel.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { Analogue } from './Analogue'; -import type { AnalogueModelMetadata } from './AnalogueModelMetadata'; -import type { AnalogueModelParameter } from './AnalogueModelParameter'; -import type { AnalogueModelSourceType } from './AnalogueModelSourceType'; -import type { ComputeCase } from './ComputeCase'; -import type { Metadata } from './Metadata'; -import type { ModelArea } from './ModelArea'; -import type { Parameter } from './Parameter'; -import type { Upload } from './Upload'; - -export type AnalogueModel = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - analogueModelId?: string; - name?: string | null; - description?: string | null; - isProcessed?: boolean; - sourceType?: AnalogueModelSourceType; - analogues?: Array | null; - fileUploads?: Array | null; - parameters?: Array | null; - modelParameters?: Array | null; - metadata?: Array | null; - modelMetadata?: Array | null; - modelAreas?: Array | null; - computeCases?: Array | null; -}; - diff --git a/src/api/generated/models/AnalogueModelMetadata.ts b/src/api/generated/models/AnalogueModelMetadata.ts deleted file mode 100644 index fdd18c09..00000000 --- a/src/api/generated/models/AnalogueModelMetadata.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { Metadata } from './Metadata'; - -export type AnalogueModelMetadata = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - analogueModelId?: string; - metadataId?: string; - analogueModel?: AnalogueModel; - metadata?: Metadata; -}; - diff --git a/src/api/generated/models/AnalogueModelParameter.ts b/src/api/generated/models/AnalogueModelParameter.ts deleted file mode 100644 index 2cd76139..00000000 --- a/src/api/generated/models/AnalogueModelParameter.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { Parameter } from './Parameter'; - -export type AnalogueModelParameter = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - analogueModelId?: string; - parameterId?: string; - parameterValue?: string | null; - analogueModel?: AnalogueModel; - parameter?: Parameter; -}; - diff --git a/src/api/generated/models/ChannelResult.ts b/src/api/generated/models/ChannelResult.ts deleted file mode 100644 index f4e771eb..00000000 --- a/src/api/generated/models/ChannelResult.ts +++ /dev/null @@ -1,36 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ChannelResultFile } from './ChannelResultFile'; -import type { ComputeCase } from './ComputeCase'; -import type { Geometry } from './Geometry'; - -export type ChannelResult = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - channelResultId?: string; - computeCaseId?: string; - computeCase?: ComputeCase; - fileDirectory?: string | null; - channelResultFiles?: Array | null; - 'segment-width__mean'?: number; - 'segment-width__sd'?: number; - 'segment-width__count'?: number; - 'channel-width__mean'?: number; - 'channel-width__sd'?: number; - 'channel-width__count'?: number; - 'segment-height__mean'?: number; - 'segment-height__sd'?: number; - 'segment-height__count'?: number; - 'channel-height__mean'?: number; - 'channel-height__sd'?: number; - 'channel-height__count'?: number; - 'channel-height__mode-mean'?: number; - 'channel-height__mode-sd'?: number; - box?: Array | null; -}; - diff --git a/src/api/generated/models/ChannelResultFile.ts b/src/api/generated/models/ChannelResultFile.ts deleted file mode 100644 index c1d20148..00000000 --- a/src/api/generated/models/ChannelResultFile.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ChannelResult } from './ChannelResult'; -import type { FileType } from './FileType'; - -export type ChannelResultFile = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - fileName?: string | null; - pathToFile?: string | null; - type?: FileType; - channelResultFileId?: string; - channelResultId?: string; - channelResult?: ChannelResult; -}; - diff --git a/src/api/generated/models/ComputeCase.ts b/src/api/generated/models/ComputeCase.ts deleted file mode 100644 index 76391825..00000000 --- a/src/api/generated/models/ComputeCase.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { ChannelResult } from './ChannelResult'; -import type { ComputeCaseInputValue } from './ComputeCaseInputValue'; -import type { ComputeJob } from './ComputeJob'; -import type { ComputeMethod } from './ComputeMethod'; -import type { ComputeType } from './ComputeType'; -import type { InputSettingValue } from './InputSettingValue'; -import type { Job } from './Job'; -import type { ModelArea } from './ModelArea'; -import type { VariogramResult } from './VariogramResult'; - -export type ComputeCase = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - computeCaseId?: string; - isApproved?: boolean; - computeType?: ComputeType; - computeMethodId?: string; - computeMethod?: ComputeMethod; - modelAreaId?: string | null; - modelArea?: ModelArea; - analogueModelId?: string | null; - analogueModel?: AnalogueModel; - computeCaseInputValues?: Array | null; - inputSettingValues?: Array | null; - computeJobs?: Array | null; - jobs?: Array | null; - variogramEstimationResults?: Array | null; - channelEstimationResult?: ChannelResult; -}; - diff --git a/src/api/generated/models/ComputeCaseInputValue.ts b/src/api/generated/models/ComputeCaseInputValue.ts deleted file mode 100644 index 6d12c48d..00000000 --- a/src/api/generated/models/ComputeCaseInputValue.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeCase } from './ComputeCase'; -import type { InputSettingValue } from './InputSettingValue'; - -export type ComputeCaseInputValue = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - computeCaseId?: string; - inputSettingvValueId?: string; - computeCase?: ComputeCase; - inputSettingValue?: InputSettingValue; -}; - diff --git a/src/api/generated/models/ComputeJob.ts b/src/api/generated/models/ComputeJob.ts deleted file mode 100644 index 3c67b7f1..00000000 --- a/src/api/generated/models/ComputeJob.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeCase } from './ComputeCase'; -import type { Job } from './Job'; - -export type ComputeJob = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - computeCaseId?: string; - jobId?: string; - isLatest?: boolean; - computeCase?: ComputeCase; - job?: Job; -}; - diff --git a/src/api/generated/models/ComputeMethod.ts b/src/api/generated/models/ComputeMethod.ts deleted file mode 100644 index 95164a2b..00000000 --- a/src/api/generated/models/ComputeMethod.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeCase } from './ComputeCase'; -import type { ComputeMethodInputType } from './ComputeMethodInputType'; -import type { ComputeType } from './ComputeType'; -import type { InputSettingType } from './InputSettingType'; - -export type ComputeMethod = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - computeMethodId?: string; - name?: string | null; - description?: string | null; - computeType?: ComputeType; - computeMethodInputTypes?: Array | null; - inputSettingTypes?: Array | null; - computeCases?: Array | null; -}; - diff --git a/src/api/generated/models/ComputeMethodInputType.ts b/src/api/generated/models/ComputeMethodInputType.ts deleted file mode 100644 index 3c585f2c..00000000 --- a/src/api/generated/models/ComputeMethodInputType.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeMethod } from './ComputeMethod'; -import type { InputSettingType } from './InputSettingType'; - -export type ComputeMethodInputType = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - computeMethodId?: string; - inputSettingTypeId?: string; - inputSettingType?: InputSettingType; - computeMethod?: ComputeMethod; -}; - diff --git a/src/api/generated/models/Coordinate.ts b/src/api/generated/models/Coordinate.ts deleted file mode 100644 index 40b1c9ee..00000000 --- a/src/api/generated/models/Coordinate.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type Coordinate = { - 'x'?: number; - 'y'?: number; - 'z'?: number; - 'm'?: number; - coordinateValue?: Coordinate; - readonly isValid?: boolean; -}; - diff --git a/src/api/generated/models/CoordinateEqualityComparer.ts b/src/api/generated/models/CoordinateEqualityComparer.ts deleted file mode 100644 index 36bb2a8a..00000000 --- a/src/api/generated/models/CoordinateEqualityComparer.ts +++ /dev/null @@ -1,6 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type CoordinateEqualityComparer = Record; diff --git a/src/api/generated/models/CoordinateSequence.ts b/src/api/generated/models/CoordinateSequence.ts deleted file mode 100644 index 515e728b..00000000 --- a/src/api/generated/models/CoordinateSequence.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { Coordinate } from './Coordinate'; -import type { Ordinates } from './Ordinates'; - -export type CoordinateSequence = { - readonly dimension?: number; - readonly measures?: number; - readonly spatial?: number; - ordinates?: Ordinates; - readonly hasZ?: boolean; - readonly hasM?: boolean; - readonly zOrdinateIndex?: number; - readonly mOrdinateIndex?: number; - first?: Coordinate; - last?: Coordinate; - readonly count?: number; -}; - diff --git a/src/api/generated/models/Dimension.ts b/src/api/generated/models/Dimension.ts deleted file mode 100644 index 05306889..00000000 --- a/src/api/generated/models/Dimension.ts +++ /dev/null @@ -1,14 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export enum Dimension { - POINT = 'Point', - CURVE = 'Curve', - SURFACE = 'Surface', - COLLAPSE = 'Collapse', - DONTCARE = 'Dontcare', - TRUE = 'True', - FALSE = 'False', -} diff --git a/src/api/generated/models/Envelope.ts b/src/api/generated/models/Envelope.ts deleted file mode 100644 index b5a06325..00000000 --- a/src/api/generated/models/Envelope.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { Coordinate } from './Coordinate'; - -export type Envelope = { - readonly isNull?: boolean; - readonly width?: number; - readonly height?: number; - readonly diameter?: number; - readonly minX?: number; - readonly maxX?: number; - readonly minY?: number; - readonly maxY?: number; - readonly area?: number; - readonly minExtent?: number; - readonly maxExtent?: number; - centre?: Coordinate; -}; - diff --git a/src/api/generated/models/FileType.ts b/src/api/generated/models/FileType.ts deleted file mode 100644 index 239a4bdc..00000000 --- a/src/api/generated/models/FileType.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export enum FileType { - JPG = 'JPG', - PNG = 'PNG', - CSV = 'CSV', -} diff --git a/src/api/generated/models/Geometry.ts b/src/api/generated/models/Geometry.ts deleted file mode 100644 index 30106198..00000000 --- a/src/api/generated/models/Geometry.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { Coordinate } from './Coordinate'; -import type { Dimension } from './Dimension'; -import type { Envelope } from './Envelope'; -import type { GeometryFactory } from './GeometryFactory'; -import type { OgcGeometryType } from './OgcGeometryType'; -import type { Point } from './Point'; -import type { PrecisionModel } from './PrecisionModel'; - -export type Geometry = { - factory?: GeometryFactory; - userData?: any; - srid?: number; - readonly geometryType?: string | null; - ogcGeometryType?: OgcGeometryType; - precisionModel?: PrecisionModel; - coordinate?: Coordinate; - readonly coordinates?: Array | null; - readonly numPoints?: number; - readonly numGeometries?: number; - readonly isSimple?: boolean; - readonly isValid?: boolean; - readonly isEmpty?: boolean; - readonly area?: number; - readonly length?: number; - centroid?: Point; - interiorPoint?: Point; - pointOnSurface?: Point; - dimension?: Dimension; - boundary?: Geometry; - boundaryDimension?: Dimension; - envelope?: Geometry; - envelopeInternal?: Envelope; - readonly isRectangle?: boolean; -}; - diff --git a/src/api/generated/models/GeometryFactory.ts b/src/api/generated/models/GeometryFactory.ts deleted file mode 100644 index 783a3c74..00000000 --- a/src/api/generated/models/GeometryFactory.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { CoordinateSequenceFactory } from './CoordinateSequenceFactory'; -import type { NtsGeometryServices } from './NtsGeometryServices'; -import type { PrecisionModel } from './PrecisionModel'; - -export type GeometryFactory = { - precisionModel?: PrecisionModel; - coordinateSequenceFactory?: CoordinateSequenceFactory; - readonly srid?: number; - geometryServices?: NtsGeometryServices; -}; - diff --git a/src/api/generated/models/GeometryOverlay.ts b/src/api/generated/models/GeometryOverlay.ts deleted file mode 100644 index 71358ad5..00000000 --- a/src/api/generated/models/GeometryOverlay.ts +++ /dev/null @@ -1,6 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type GeometryOverlay = Record; diff --git a/src/api/generated/models/GetChannelResultsDto.ts b/src/api/generated/models/GetChannelResultsDto.ts index 531f1c35..f3179715 100644 --- a/src/api/generated/models/GetChannelResultsDto.ts +++ b/src/api/generated/models/GetChannelResultsDto.ts @@ -10,14 +10,14 @@ import type { CoordinateDto } from './CoordinateDto'; import type { GetChannelResultsFileDto } from './GetChannelResultsFileDto'; export type GetChannelResultsDto = { - channelResultId?: string; - computeCaseId?: string; - type?: ComputeType; - channelResultFiles?: Array | null; - segmentWidth?: ChannelEstimationResultDto; - channelWidth?: ChannelEstimationResultDto; - segmentHeight?: ChannelEstimationResultDto; - channelHeight?: ChannelHeightDto; - box?: Array | null; + channelResultId: string; + computeCaseId: string; + type: ComputeType; + channelResultFiles: Array; + segmentWidth: ChannelEstimationResultDto; + channelWidth: ChannelEstimationResultDto; + segmentHeight: ChannelEstimationResultDto; + channelHeight: ChannelHeightDto; + box: Array; }; diff --git a/src/api/generated/models/GetChannelResultsFileDto.ts b/src/api/generated/models/GetChannelResultsFileDto.ts index ee7ce48f..120f2551 100644 --- a/src/api/generated/models/GetChannelResultsFileDto.ts +++ b/src/api/generated/models/GetChannelResultsFileDto.ts @@ -4,7 +4,7 @@ /* eslint-disable */ export type GetChannelResultsFileDto = { - fileName?: string | null; - channelResultFileId?: string | null; + fileName: string; + channelResultFileId: string; }; diff --git a/src/api/generated/models/GetVariogramResultsDto.ts b/src/api/generated/models/GetVariogramResultsDto.ts index 8a149357..c588d6b4 100644 --- a/src/api/generated/models/GetVariogramResultsDto.ts +++ b/src/api/generated/models/GetVariogramResultsDto.ts @@ -4,23 +4,23 @@ /* eslint-disable */ import type { CoordinateDto } from './CoordinateDto'; -import type { VariogramResultFile } from './VariogramResultFile'; +import type { GetVariogramResultsVariogramResultFileDto } from './GetVariogramResultsVariogramResultFileDto'; export type GetVariogramResultsDto = { - computeCaseId?: string; - variogramResultId?: string; - identifier?: number; - variogramResultFiles?: Array | null; - rmajor?: number; - rminor?: number; - azimuth?: number; - rvertical?: number; - sigma?: number; - quality?: number; + computeCaseId: string; + variogramResultId: string; + identifier: number; + variogramResultFiles: Array; + rmajor: number; + rminor: number; + azimuth: number; + rvertical: number; + sigma: number; + quality: number; family?: string | null; archelFilter?: string | null; indicator?: string | null; attribute?: string | null; - box?: Array | null; + box: Array; }; diff --git a/src/api/generated/models/CoordinateSequenceFactory.ts b/src/api/generated/models/GetVariogramResultsVariogramResultFileDto.ts similarity index 54% rename from src/api/generated/models/CoordinateSequenceFactory.ts rename to src/api/generated/models/GetVariogramResultsVariogramResultFileDto.ts index 4e15b236..7427b27c 100644 --- a/src/api/generated/models/CoordinateSequenceFactory.ts +++ b/src/api/generated/models/GetVariogramResultsVariogramResultFileDto.ts @@ -3,9 +3,8 @@ /* tslint:disable */ /* eslint-disable */ -import type { Ordinates } from './Ordinates'; - -export type CoordinateSequenceFactory = { - ordinates?: Ordinates; +export type GetVariogramResultsVariogramResultFileDto = { + fileName: string; + variogramResultFileId: string; }; diff --git a/src/api/generated/models/InputSettingType.ts b/src/api/generated/models/InputSettingType.ts deleted file mode 100644 index 76cc03ca..00000000 --- a/src/api/generated/models/InputSettingType.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeMethod } from './ComputeMethod'; -import type { ComputeMethodInputType } from './ComputeMethodInputType'; -import type { InputSettingValue } from './InputSettingValue'; - -export type InputSettingType = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - inputSettingTypeId?: string; - name?: string | null; - description?: string | null; - computeMethodInputTypes?: Array | null; - computeMethods?: Array | null; - inputSettingValues?: Array | null; -}; - diff --git a/src/api/generated/models/InputSettingValue.ts b/src/api/generated/models/InputSettingValue.ts deleted file mode 100644 index 15482517..00000000 --- a/src/api/generated/models/InputSettingValue.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeCase } from './ComputeCase'; -import type { ComputeCaseInputValue } from './ComputeCaseInputValue'; -import type { InputSettingType } from './InputSettingType'; - -export type InputSettingValue = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - inputSettingValueId?: string; - name?: string | null; - value?: string | null; - inputSettingTypeId?: string; - inputSettingType?: InputSettingType; - computeCases?: Array | null; - computeCaseInputValues?: Array | null; -}; - diff --git a/src/api/generated/models/Job.ts b/src/api/generated/models/Job.ts deleted file mode 100644 index b64f09ba..00000000 --- a/src/api/generated/models/Job.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { ComputeCase } from './ComputeCase'; -import type { JobStatus } from './JobStatus'; -import type { JobType } from './JobType'; -import type { Upload } from './Upload'; - -export type Job = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - jobId?: string; - name?: string | null; - analogueModelId?: string; - analogueModel?: AnalogueModel; - jobStatus?: JobStatus; - jobType?: JobType; - uploads?: Array | null; - computeCases?: Array | null; -}; - diff --git a/src/api/generated/models/Metadata.ts b/src/api/generated/models/Metadata.ts deleted file mode 100644 index b9dd4420..00000000 --- a/src/api/generated/models/Metadata.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { AnalogueModelMetadata } from './AnalogueModelMetadata'; -import type { MetadataType } from './MetadataType'; - -export type Metadata = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - metadataId?: string; - externalId?: string | null; - metadataTypeId?: string; - metadataType?: MetadataType; - value?: string | null; - analogueModels?: Array | null; - modelMetadata?: Array | null; -}; - diff --git a/src/api/generated/models/MetadataSourceType.ts b/src/api/generated/models/MetadataSourceType.ts deleted file mode 100644 index 8ee5ce34..00000000 --- a/src/api/generated/models/MetadataSourceType.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export enum MetadataSourceType { - SMDA = 'Smda', - PEACOCK = 'Peacock', - NATIVE = 'Native', - INI_FILE = 'IniFile', -} diff --git a/src/api/generated/models/MetadataType.ts b/src/api/generated/models/MetadataType.ts deleted file mode 100644 index cd9716e1..00000000 --- a/src/api/generated/models/MetadataType.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { Metadata } from './Metadata'; -import type { MetadataSourceType } from './MetadataSourceType'; - -export type MetadataType = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - metadataTypeId?: string; - metadataSource?: MetadataSourceType; - name?: string | null; - description?: string | null; - metadata?: Array | null; -}; - diff --git a/src/api/generated/models/ModelArea.ts b/src/api/generated/models/ModelArea.ts deleted file mode 100644 index ed19cc00..00000000 --- a/src/api/generated/models/ModelArea.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { ComputeCase } from './ComputeCase'; -import type { Geometry } from './Geometry'; -import type { ModelAreaType } from './ModelAreaType'; - -export type ModelArea = { - modelAreaId?: string; - name?: string | null; - modelAreaTypeId?: string; - modelAreaType?: ModelAreaType; - analogueModelId?: string; - analogueModel?: AnalogueModel; - geometryList?: Array | null; - computeCases?: Array | null; -}; - diff --git a/src/api/generated/models/ModelAreaType.ts b/src/api/generated/models/ModelAreaType.ts deleted file mode 100644 index 3c568ddb..00000000 --- a/src/api/generated/models/ModelAreaType.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type ModelAreaType = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - modelAreaTypeId?: string; - name?: string | null; - description?: string | null; -}; - diff --git a/src/api/generated/models/NtsGeometryServices.ts b/src/api/generated/models/NtsGeometryServices.ts deleted file mode 100644 index 244f1252..00000000 --- a/src/api/generated/models/NtsGeometryServices.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { CoordinateEqualityComparer } from './CoordinateEqualityComparer'; -import type { CoordinateSequenceFactory } from './CoordinateSequenceFactory'; -import type { GeometryOverlay } from './GeometryOverlay'; -import type { PrecisionModel } from './PrecisionModel'; - -export type NtsGeometryServices = { - geometryOverlay?: GeometryOverlay; - coordinateEqualityComparer?: CoordinateEqualityComparer; - readonly defaultSRID?: number; - defaultCoordinateSequenceFactory?: CoordinateSequenceFactory; - defaultPrecisionModel?: PrecisionModel; -}; - diff --git a/src/api/generated/models/OgcGeometryType.ts b/src/api/generated/models/OgcGeometryType.ts deleted file mode 100644 index 3b37c696..00000000 --- a/src/api/generated/models/OgcGeometryType.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export enum OgcGeometryType { - POINT = 'Point', - LINE_STRING = 'LineString', - POLYGON = 'Polygon', - MULTI_POINT = 'MultiPoint', - MULTI_LINE_STRING = 'MultiLineString', - MULTI_POLYGON = 'MultiPolygon', - GEOMETRY_COLLECTION = 'GeometryCollection', - CIRCULAR_STRING = 'CircularString', - COMPOUND_CURVE = 'CompoundCurve', - CURVE_POLYGON = 'CurvePolygon', - MULTI_CURVE = 'MultiCurve', - MULTI_SURFACE = 'MultiSurface', - CURVE = 'Curve', - SURFACE = 'Surface', - POLYHEDRAL_SURFACE = 'PolyhedralSurface', - TIN = 'TIN', -} diff --git a/src/api/generated/models/Ordinates.ts b/src/api/generated/models/Ordinates.ts deleted file mode 100644 index 1c8187f7..00000000 --- a/src/api/generated/models/Ordinates.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export enum Ordinates { - NONE = 'None', - X = 'X', - Y = 'Y', - XY = 'XY', - Z = 'Z', - XYZ = 'XYZ', - SPATIAL4 = 'Spatial4', - SPATIAL5 = 'Spatial5', - SPATIAL6 = 'Spatial6', - SPATIAL7 = 'Spatial7', - SPATIAL8 = 'Spatial8', - SPATIAL9 = 'Spatial9', - SPATIAL10 = 'Spatial10', - SPATIAL11 = 'Spatial11', - SPATIAL12 = 'Spatial12', - SPATIAL13 = 'Spatial13', - SPATIAL14 = 'Spatial14', - SPATIAL15 = 'Spatial15', - SPATIAL16 = 'Spatial16', - ALL_SPATIAL_ORDINATES = 'AllSpatialOrdinates', - M = 'M', - XYM = 'XYM', - XYZM = 'XYZM', - MEASURE2 = 'Measure2', - MEASURE3 = 'Measure3', - MEASURE4 = 'Measure4', - MEASURE5 = 'Measure5', - MEASURE6 = 'Measure6', - MEASURE7 = 'Measure7', - MEASURE8 = 'Measure8', - MEASURE9 = 'Measure9', - MEASURE10 = 'Measure10', - MEASURE11 = 'Measure11', - MEASURE12 = 'Measure12', - MEASURE13 = 'Measure13', - MEASURE14 = 'Measure14', - MEASURE15 = 'Measure15', - MEASURE16 = 'Measure16', - ALL_MEASURE_ORDINATES = 'AllMeasureOrdinates', - ALL_ORDINATES = 'AllOrdinates', -} diff --git a/src/api/generated/models/Parameter.ts b/src/api/generated/models/Parameter.ts deleted file mode 100644 index c1351556..00000000 --- a/src/api/generated/models/Parameter.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { AnalogueModelParameter } from './AnalogueModelParameter'; - -export type Parameter = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - parameterId?: string; - identifier?: string | null; - name?: string | null; - description?: string | null; - analogueModels?: Array | null; - modelParameters?: Array | null; -}; - diff --git a/src/api/generated/models/Point.ts b/src/api/generated/models/Point.ts deleted file mode 100644 index 187b4904..00000000 --- a/src/api/generated/models/Point.ts +++ /dev/null @@ -1,46 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { Coordinate } from './Coordinate'; -import type { CoordinateSequence } from './CoordinateSequence'; -import type { Dimension } from './Dimension'; -import type { Envelope } from './Envelope'; -import type { Geometry } from './Geometry'; -import type { GeometryFactory } from './GeometryFactory'; -import type { OgcGeometryType } from './OgcGeometryType'; -import type { PrecisionModel } from './PrecisionModel'; - -export type Point = { - factory?: GeometryFactory; - userData?: any; - srid?: number; - precisionModel?: PrecisionModel; - readonly numGeometries?: number; - readonly isSimple?: boolean; - readonly isValid?: boolean; - readonly area?: number; - readonly length?: number; - centroid?: Point; - interiorPoint?: Point; - pointOnSurface?: Point; - envelope?: Geometry; - envelopeInternal?: Envelope; - readonly isRectangle?: boolean; - coordinateSequence?: CoordinateSequence; - readonly coordinates?: Array | null; - readonly numPoints?: number; - readonly isEmpty?: boolean; - dimension?: Dimension; - boundaryDimension?: Dimension; - 'x'?: number; - 'y'?: number; - coordinate?: Coordinate; - readonly geometryType?: string | null; - ogcGeometryType?: OgcGeometryType; - boundary?: Geometry; - 'z'?: number; - 'm'?: number; -}; - diff --git a/src/api/generated/models/PrecisionModel.ts b/src/api/generated/models/PrecisionModel.ts deleted file mode 100644 index 89b8aa42..00000000 --- a/src/api/generated/models/PrecisionModel.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { PrecisionModels } from './PrecisionModels'; - -export type PrecisionModel = { - readonly isFloating?: boolean; - readonly maximumSignificantDigits?: number; - scale?: number; - readonly gridSize?: number; - precisionModelType?: PrecisionModels; -}; - diff --git a/src/api/generated/models/PrecisionModels.ts b/src/api/generated/models/PrecisionModels.ts deleted file mode 100644 index 3ab95cad..00000000 --- a/src/api/generated/models/PrecisionModels.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export enum PrecisionModels { - FLOATING = 'Floating', - FLOATING_SINGLE = 'FloatingSingle', - FIXED = 'Fixed', -} diff --git a/src/api/generated/models/Upload.ts b/src/api/generated/models/Upload.ts deleted file mode 100644 index 168cde6d..00000000 --- a/src/api/generated/models/Upload.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AnalogueModel } from './AnalogueModel'; -import type { Job } from './Job'; -import type { UploadFileCategory } from './UploadFileCategory'; -import type { UploadFileType } from './UploadFileType'; -import type { UploadStatus } from './UploadStatus'; - -export type Upload = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - uploadId?: string; - analogueModel?: AnalogueModel; - uploadStatus?: UploadStatus; - uploadFileType?: UploadFileType; - uploadFileCategory?: UploadFileCategory; - filePath?: string | null; - originalFileName?: string | null; - jobs?: Array | null; -}; - diff --git a/src/api/generated/models/VariogramResult.ts b/src/api/generated/models/VariogramResult.ts deleted file mode 100644 index caa70f90..00000000 --- a/src/api/generated/models/VariogramResult.ts +++ /dev/null @@ -1,33 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { ComputeCase } from './ComputeCase'; -import type { Geometry } from './Geometry'; -import type { VariogramResultFile } from './VariogramResultFile'; - -export type VariogramResult = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - variogramResultId?: string; - computeCaseId?: string; - computeCase?: ComputeCase; - identifier?: number; - fileDirectory?: string | null; - variogramResultFiles?: Array | null; - rmajor?: number; - rminor?: number; - azimuth?: number; - rvertical?: number; - sigma?: number; - quality?: number; - family?: string | null; - archelFilter?: string | null; - indicator?: string | null; - attribute?: string | null; - box?: Array | null; -}; - diff --git a/src/api/generated/models/VariogramResultFile.ts b/src/api/generated/models/VariogramResultFile.ts deleted file mode 100644 index 240ec135..00000000 --- a/src/api/generated/models/VariogramResultFile.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { FileType } from './FileType'; -import type { VariogramResult } from './VariogramResult'; - -export type VariogramResultFile = { - createdBy?: string | null; - createdDate?: string; - lastModifiedBy?: string | null; - lastModifiedDate?: string; - fileName?: string | null; - pathToFile?: string | null; - type?: FileType; - variogramResultFileId?: string; - variogramResultId?: string; - variogramResult?: VariogramResult; -}; - diff --git a/src/api/generated/services/ImagesService.ts b/src/api/generated/services/ImagesService.ts new file mode 100644 index 00000000..461e58a4 --- /dev/null +++ b/src/api/generated/services/ImagesService.ts @@ -0,0 +1,28 @@ +/* generated using openapi-typescript-codegen -- do no edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { CancelablePromise } from '../core/CancelablePromise'; +import { OpenAPI } from '../core/OpenAPI'; +import { request as __request } from '../core/request'; + +export class ImagesService { + + /** + * @param imageId + * @returns binary Success + * @throws ApiError + */ + public static getApiImagesVariogram( + imageId: string, + ): CancelablePromise { + return __request(OpenAPI, { + method: 'GET', + url: '/api/images/variogram/{imageId}', + path: { + 'imageId': imageId, + }, + }); + } + +} diff --git a/src/assets/VaritogramIcon.ts b/src/assets/VaritogramIcon.ts new file mode 100644 index 00000000..4455347a --- /dev/null +++ b/src/assets/VaritogramIcon.ts @@ -0,0 +1,8 @@ +export const VariogramIcon = { + name: 'Variogram', + prefix: 'string', + height: '24', + width: '24', + svgPathData: + 'M5.99996 8C7.25657 8.00005 7.92861 7.12723 8.29117 6.65634L8.32567 6.61159C8.72108 6.10004 8.83631 6.01523 8.95178 6.00222C8.96291 6.01104 8.97815 6.02428 8.9976 6.04365C9.10055 6.14614 9.24417 6.3484 9.40609 6.69585C9.72843 7.38753 10.0225 8.43183 10.2669 9.74543C10.7523 12.3547 11 15.7899 11 19C11 19.5523 11.4477 20 12 20C12.5523 20 13 19.5523 13 19C13 15.7899 13.2477 12.3547 13.7331 9.74543C13.9775 8.43183 14.2716 7.38753 14.5939 6.69585C14.7558 6.3484 14.8995 6.14614 15.0024 6.04365C15.0219 6.02428 15.0371 6.01104 15.0482 6.00222C15.1637 6.01523 15.2789 6.10004 15.6743 6.61159L15.7088 6.65634C16.0714 7.12723 16.7434 8.00005 18 8C18.6812 7.99997 19.1658 7.6446 19.4677 7.35765C19.6198 7.21313 19.7532 7.05934 19.858 6.93608L19.9308 6.8502L19.9309 6.85013C20.0087 6.75814 20.0687 6.68731 20.1318 6.61962C20.1427 6.60791 20.153 6.5972 20.1626 6.5874C20.1976 6.6163 20.241 6.65517 20.2929 6.70711C20.6834 7.09763 21.3166 7.09763 21.7071 6.70711C22.0976 6.31658 22.0976 5.68342 21.7071 5.29289C21.2489 4.83472 20.6729 4.46402 19.9806 4.52762C19.3287 4.58752 18.8938 5.01477 18.6694 5.25534C18.5696 5.36232 18.469 5.48135 18.3874 5.57787L18.3874 5.5779L18.3348 5.64005C18.2353 5.75702 18.1598 5.84152 18.0899 5.90793C18.0313 5.96364 17.9949 5.98904 17.9768 5.99967C17.7877 5.99394 17.6596 5.90973 17.2567 5.38845C17.2384 5.36472 17.2189 5.33922 17.1984 5.31222L17.1983 5.3121C16.8561 4.86303 16.1985 4 15 4C14.4081 4 13.9343 4.28484 13.5913 4.62628C13.2568 4.95934 12.9942 5.3938 12.7811 5.85105C12.4733 6.51156 12.2156 7.33746 12 8.26077C11.7844 7.33746 11.5267 6.51156 11.2189 5.85105C11.0058 5.3938 10.7432 4.95934 10.4087 4.62628C10.0657 4.28484 9.59194 4 9 4C7.80149 4 7.1439 4.86303 6.80173 5.3121C6.78112 5.33915 6.76166 5.36469 6.74329 5.38845C6.34036 5.90973 6.2123 5.99394 6.02318 5.99967C6.00511 5.98904 5.96871 5.96364 5.91009 5.90793C5.84021 5.84152 5.76474 5.75702 5.66522 5.64005L5.61259 5.5779L5.61258 5.5779C5.53102 5.48137 5.43042 5.36233 5.33061 5.25534C5.10619 5.01477 4.67132 4.58752 4.01938 4.52762C3.32706 4.46402 2.75106 4.83472 2.29289 5.29289C1.90237 5.68342 1.90237 6.31658 2.29289 6.70711C2.68342 7.09763 3.31658 7.09763 3.70711 6.70711C3.75904 6.65517 3.80236 6.6163 3.83745 6.5874C3.84701 6.5972 3.85725 6.60791 3.86818 6.61962C3.93133 6.68733 3.99129 6.75818 4.06915 6.8502L4.06915 6.8502L4.14196 6.93608C4.24684 7.05934 4.38023 7.21313 4.5323 7.35765C4.83423 7.6446 5.31878 7.99997 5.99996 8ZM8.93007 5.98704C8.92925 5.98661 8.92884 5.98644 8.92884 5.9865C8.92885 5.98658 8.92997 5.98725 8.9322 5.98825C8.93131 5.98773 8.9306 5.98733 8.93007 5.98704ZM6.03701 6.00643C6.03706 6.00664 6.03517 6.00606 6.03117 6.00406C6.03496 6.00521 6.03696 6.00621 6.03701 6.00643ZM3.95393 6.50834C3.95391 6.5085 3.95176 6.50953 3.94754 6.51092C3.95184 6.50888 3.95395 6.50818 3.95393 6.50834ZM15.0712 5.9865C15.0712 5.98641 15.07 5.98691 15.0678 5.98825C15.07 5.98725 15.0712 5.98658 15.0712 5.9865ZM17.963 6.00643C17.9629 6.00664 17.9648 6.00606 17.9688 6.00406C17.965 6.00521 17.963 6.00621 17.963 6.00643ZM20.0461 6.50834C20.0461 6.5085 20.0482 6.50953 20.0525 6.51092C20.0482 6.50888 20.046 6.50818 20.0461 6.50834Z', +}; diff --git a/src/features/ModelView/ModelNavigationBar/ModelNavigationBar.tsx b/src/features/ModelView/ModelNavigationBar/ModelNavigationBar.tsx index e58db95f..fc789586 100644 --- a/src/features/ModelView/ModelNavigationBar/ModelNavigationBar.tsx +++ b/src/features/ModelView/ModelNavigationBar/ModelNavigationBar.tsx @@ -5,9 +5,9 @@ import { format_list_bulleted as FORMATLISTBULLET, grid_on as GRID, IconData, - timeline as TIMELINE, } from '@equinor/eds-icons'; import { useLocation, useNavigate } from 'react-router-dom'; +import { VariogramIcon } from '../../../assets/VaritogramIcon'; import * as Styled from './ModelNavigationBar.styled'; type MenuItems = SidebarLinkProps & { @@ -66,21 +66,21 @@ export const ModelNavigationBar = () => { const variogramItems: MenuItems = { label: 'Variogram', href: '', - icon: TIMELINE, + icon: VariogramIcon, subItems: [ { label: 'Compute settings', name: 'variogram', type: 'compute', href: 'compute/variogram', - icon: TIMELINE, + icon: VariogramIcon, }, { label: 'Results', name: 'variogram', type: 'results', href: 'results/variogram', - icon: TIMELINE, + icon: VariogramIcon, }, ], }; diff --git a/src/features/Results/CaseResult/CaseResultView/CaseResultView.styled.tsx b/src/features/Results/CaseResult/CaseResultView/CaseResultView.styled.tsx index ef1160a4..bbfb4bf5 100644 --- a/src/features/Results/CaseResult/CaseResultView/CaseResultView.styled.tsx +++ b/src/features/Results/CaseResult/CaseResultView/CaseResultView.styled.tsx @@ -17,6 +17,7 @@ export const CaseResultView = styled.div` export const CaseResultList = styled.div` display: flex; flex-direction: column; + row-gap: ${spacings.X_LARGE}; width: 100%; `; diff --git a/src/features/Results/CaseResult/CaseResultView/CaseResultView.tsx b/src/features/Results/CaseResult/CaseResultView/CaseResultView.tsx index a9b13417..9375e90e 100644 --- a/src/features/Results/CaseResult/CaseResultView/CaseResultView.tsx +++ b/src/features/Results/CaseResult/CaseResultView/CaseResultView.tsx @@ -5,10 +5,10 @@ import { Typography } from '@equinor/eds-core-react'; import { ComputeCaseDto, GetChannelResultsDto, + GetVariogramResultsDto, } from '../../../../api/generated'; import { ChannelResult } from './ObjectCaseResult/ChannelResult'; import { VariogramCaseResult } from './VariogramCaseResult/VariogramCaseResult'; -import ResultIMG from './vargrest_output-0-_variogram_slices_.png'; export const CaseResultView = ({ channelResultList, @@ -16,17 +16,14 @@ export const CaseResultView = ({ computeCases, }: { channelResultList?: GetChannelResultsDto[]; - variogramResultList?: GetChannelResultsDto[]; + variogramResultList?: GetVariogramResultsDto[]; computeCases?: ComputeCaseDto[]; }) => { const channelType = channelResultList !== undefined && channelResultList[0].type ? channelResultList[0].type : ''; - const variogramType = - variogramResultList !== undefined && variogramResultList[0].type - ? variogramResultList[0].type - : ''; + const variogramType = variogramResultList !== undefined ? 'Variogram' : ''; return ( @@ -42,7 +39,6 @@ export const CaseResultView = ({ {variogramResultList && ( )} {channelResultList && diff --git a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx new file mode 100644 index 00000000..c1a71631 --- /dev/null +++ b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/ImageResult/ImageResult.tsx @@ -0,0 +1,33 @@ +import { useQuery } from '@tanstack/react-query'; +import { getVariogramImage } from '../../../../../../api/custom/getImageById'; +import { GetVariogramResultsVariogramResultFileDto } from '../../../../../../api/generated'; +import { ImageView } from '../../../../../../components/ImageView/ImageView'; + +export const ImageResult = ({ + resultFiels, +}: { + resultFiels: GetVariogramResultsVariogramResultFileDto[]; +}) => { + const wantedResultFile = resultFiels.find((x) => + x.fileName.includes('variogram_slices_'), + ); + + const imageId = wantedResultFile + ? wantedResultFile.variogramResultFileId + : ''; + + const { data } = useQuery({ + queryKey: ['case-image', imageId], + queryFn: () => getVariogramImage(imageId), + }); + + return ( + <> + + + ); +}; diff --git a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramCaseResult.tsx b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramCaseResult.tsx index 746b54d4..13d4c596 100644 --- a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramCaseResult.tsx +++ b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramCaseResult.tsx @@ -1,25 +1,23 @@ import { GetVariogramResultsDto } from '../../../../../api/generated'; import { CaseCardComponent } from '../../../../../components/CaseCardComponent/CaseCardComponent'; -import { ImageView } from '../../../../../components/ImageView/ImageView'; +import { ImageResult } from './ImageResult/ImageResult'; import * as Styled from './VariogramCaseResult.styled'; import { VariogramResultTable } from './VariogramResultTable'; export const VariogramCaseResult = ({ resultList, - img, }: { resultList: GetVariogramResultsDto[]; - img: string; }) => { return ( <> {resultList.map((item) => ( - + - + ))} diff --git a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramResultTable.tsx b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramResultTable.tsx index 2af3111b..73f64c1c 100644 --- a/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramResultTable.tsx +++ b/src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramResultTable.tsx @@ -1,37 +1,55 @@ import { Table } from '@equinor/eds-core-react'; import { GetVariogramResultsDto } from '../../../../../api/generated'; +import { useFetchCases } from '../../../../../hooks/useFetchCases'; + +const NumberOfDecimals = 3; export const VariogramResultTable = ({ data, }: { data: GetVariogramResultsDto; }) => { + const roundResultString = (value?: number) => { + if (value) { + return value.toFixed(NumberOfDecimals); + } + }; + const caseList = useFetchCases(); + const resultCase = caseList.data?.data.filter( + (c) => c.computeCaseId === data.computeCaseId, + ); + + // console.log(data); + // console.log(resultCase && resultCase[0]); + return ( Quality factor - {data.quality} + {roundResultString(data.quality)} Model area - --Data-- + {resultCase && resultCase[0].modelArea.name} Compute method - --Data-- + + {resultCase && resultCase[0].computeMethod.name} + Attribute - --Data-- + {data.attribute ? data.attribute : '--'} Variogram model - --Data-- + {data.family} Sigma - --Data-- + {roundResultString(data.sigma)}