diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts index 3f0389fd7..51665996a 100644 --- a/client/dive-common/apispec.ts +++ b/client/dive-common/apispec.ts @@ -81,8 +81,7 @@ export interface MultiCamImportFolderArgs { sourcePath: string; trackFile: string; }>; // path/track file per camera - calibrationFile?: string; // NPZ calibation matrix file - stereoConfigurationFile?: string; // kwiver *.conf file + calibrationFile?: string; // NPZ calibation matrix file or kwivier *.conf file type: 'image-sequence' | 'video'; } @@ -93,8 +92,7 @@ export interface MultiCamImportKeywordArgs { glob: string; trackFile: string; }>; // glob pattern for base folder - calibrationFile?: string; // NPZ calibation matrix file - stereoConfigurationFile?: string; // kwiver *.conf file + calibrationFile?: string; // NPZ calibation matrix file or kwiver *.conf file type: 'image-sequence'; // Always image-sequence type for glob matching } @@ -139,7 +137,7 @@ interface DatasetMeta extends DatasetMetaMutable { originalFps?: Readonly; subType: Readonly; // In future this could have stuff like IR/EO multiCamMedia: Readonly; - stereoConfigurationFile?: Readonly; + calibrationFile?: Readonly; } interface Api { diff --git a/client/dive-common/components/ImportButton.vue b/client/dive-common/components/ImportButton.vue index e1bac6e10..7d9eb40b1 100644 --- a/client/dive-common/components/ImportButton.vue +++ b/client/dive-common/components/ImportButton.vue @@ -113,18 +113,6 @@ export default defineComponent({ - - - mdi-binoculars - - - Stereoscopic Calibration - - > = ref({}); const globList: Ref> = ref({}); const calibrationFile = ref(''); - const stereoConfigurationFile = ref(''); const defaultDisplay = ref('left'); const importAnnotationFilesCheck = ref(false); const { error: importError, request: importRequest } = useRequest(); @@ -199,8 +198,6 @@ export default defineComponent({ const path = ret.filePaths[0]; if (folder === 'calibration') { calibrationFile.value = path; - } else if (folder === 'stereoConfiguration') { - stereoConfigurationFile.value = path; } else if (importType.value === 'multi') { if (ret.root) { folderList.value[folder].sourcePath = ret.root; @@ -253,10 +250,6 @@ export default defineComponent({ calibrationFile: calibrationFile.value, type: props.dataType, }; - if (props.calibration) { - delete args.calibrationFile; - args.stereoConfigurationFile = stereoConfigurationFile.value; - } emit('begin-multicam-import', args); } else if (importType.value === 'keyword') { @@ -284,7 +277,7 @@ export default defineComponent({ defaultDisplay, displayKeys, importAnnotationFilesCheck, - stereoConfigurationFile, + // stereoConfigurationFile, //Methods open, prepForImport, @@ -479,32 +472,6 @@ export default defineComponent({ - - - - - Open Stereoscopic Configuration - - mdi-matrix - - - @@ -531,7 +498,7 @@ export default defineComponent({ Begin Import diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue index 10631b783..a2c151919 100644 --- a/client/dive-common/components/Viewer.vue +++ b/client/dive-common/components/Viewer.vue @@ -571,7 +571,7 @@ export default defineComponent({ context.resetActive(); const meta = await loadMetadata(datasetId.value); - isStereoConfigMode.value = meta.stereoConfigurationFile != null; + isStereoConfigMode.value = meta.calibrationFile != null; const defaultCameraMeta = meta.multiCamMedia?.cameras[meta.multiCamMedia.defaultDisplay]; baseMulticamDatasetId.value = datasetId.value; @@ -741,7 +741,7 @@ export default defineComponent({ }); } - if (meta.stereoConfigurationFile) { + if (meta.calibrationFile) { context.register({ component: TrackViewerSettings, description: 'Track Viewer Settings', diff --git a/client/platform/desktop/backend/native/multiCamImport.ts b/client/platform/desktop/backend/native/multiCamImport.ts index 58698be7a..306206ef3 100644 --- a/client/platform/desktop/backend/native/multiCamImport.ts +++ b/client/platform/desktop/backend/native/multiCamImport.ts @@ -108,7 +108,6 @@ async function beginMultiCamImport(args: MultiCamImportArgs): Promise