diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts index 0297a6ec1..7f2d896e1 100644 --- a/client/dive-common/apispec.ts +++ b/client/dive-common/apispec.ts @@ -7,6 +7,7 @@ import { TrackData } from 'vue-media-annotator/track'; import { Attribute } from 'vue-media-annotator/use/AttributeTypes'; import { CustomStyle } from 'vue-media-annotator/StyleManager'; import { AttributeTrackFilter } from 'vue-media-annotator/AttributeTrackFilterControls'; +import { MultiCamDesktop } from 'platform/desktop/constants'; type DatasetType = 'image-sequence' | 'video' | 'multi' | 'large-image'; type MultiTrackRecord = Record; @@ -84,7 +85,7 @@ export interface MultiCamImportFolderArgs { sourcePath: string; trackFile: string; }>; // path/track file per camera - calibrationFile?: string; // NPZ calibation matrix file + calibrationFile?: string; // NPZ calibation matrix file or kwivier *.conf file type: 'image-sequence' | 'video'; } @@ -95,7 +96,7 @@ export interface MultiCamImportKeywordArgs { glob: string; trackFile: string; }>; // glob pattern for base folder - calibrationFile?: string; // NPZ calibation matrix file + calibrationFile?: string; // NPZ calibation matrix file or kwiver *.conf file type: 'image-sequence'; // Always image-sequence type for glob matching } @@ -140,6 +141,8 @@ interface DatasetMeta extends DatasetMetaMutable { originalFps?: Readonly; subType: Readonly; // In future this could have stuff like IR/EO multiCamMedia: Readonly; + multiCam: Readonly; + //calibrationFile?: Readonly; } interface Api { @@ -166,7 +169,7 @@ interface Api { saveAttributeTrackFilters(datasetId: string, args: SaveAttributeTrackFilterArgs): Promise; // Non-Endpoint shared functions - openFromDisk(datasetType: DatasetType | 'bulk' | 'calibration' | 'annotation' | 'text' | 'zip', directory?: boolean): + openFromDisk(datasetType: DatasetType | 'bulk' | 'calibration' | 'annotation' | 'text' | 'zip' | 'stereoConfiguration', directory?: boolean): Promise<{canceled?: boolean; filePaths: string[]; fileList?: File[]; root?: string}>; getTiles?(itemId: string, projection?: string): Promise; // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/client/dive-common/components/ImportButton.vue b/client/dive-common/components/ImportButton.vue index 739fe2640..abb61ae5f 100644 --- a/client/dive-common/components/ImportButton.vue +++ b/client/dive-common/components/ImportButton.vue @@ -49,7 +49,7 @@ export default defineComponent({ offset-y offset-x nudge-left="180" - max-width="180" + max-width="250" >