From 584394abdd76192a8ad3f01521203660ad7d5d9b Mon Sep 17 00:00:00 2001
From: Jules BOURDAIS <jules.bourdais@kitware.com>
Date: Wed, 21 Jun 2023 14:07:15 +0200
Subject: [PATCH] start addressing Bryon's comments

- show stereo matching only in multicam mode
- show 3d track viewer toggle only in stereo config mode
- trigger annotator resize on 3d track viewer toggling
- add track viewer settings to right sidebar only in stereo config mode
---
 client/dive-common/apispec.ts                 |  1 +
 .../components/TrackSettingsPanel.vue         | 10 +++-
 client/dive-common/components/Viewer.vue      | 54 +++++++++++++++----
 .../desktop/frontend/components/Recent.vue    |  2 +-
 4 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/client/dive-common/apispec.ts b/client/dive-common/apispec.ts
index 4b1e2b0db..5e4e371ed 100644
--- a/client/dive-common/apispec.ts
+++ b/client/dive-common/apispec.ts
@@ -130,6 +130,7 @@ interface DatasetMeta extends DatasetMetaMutable {
   originalFps?: Readonly<number>;
   subType: Readonly<SubType>; // In future this could have stuff like IR/EO
   multiCamMedia: Readonly<MultiCamMedia | null>;
+  stereoConfigurationFile?: Readonly<string>;
 }
 
 interface Api {
diff --git a/client/dive-common/components/TrackSettingsPanel.vue b/client/dive-common/components/TrackSettingsPanel.vue
index 13409cb60..c5f018654 100644
--- a/client/dive-common/components/TrackSettingsPanel.vue
+++ b/client/dive-common/components/TrackSettingsPanel.vue
@@ -7,6 +7,8 @@ import {
   computed,
 } from '@vue/composition-api';
 import { clientSettings } from 'dive-common/store/settings';
+import { useCameraStore } from '../../src/provides';
+
 
 export default defineComponent({
   name: 'TrackSettingsPanel',
@@ -30,10 +32,13 @@ export default defineComponent({
       interpolate: 'Whether new tracks should have interpolation enabled by default',
       continuous: 'Immediately stay in detection creation mode after creating a new track.  Hit Esc to exit.',
       prompt: 'Prompt user before deleting a track?',
+      stereoMatching: 'When manually adding detections, control whether to create a mirror feature in other cameras.',
     });
     const modes = ref(['Track', 'Detection']);
     // Add unknown as the default type to the typeList
     const typeList = computed(() => ['unknown'].concat(props.allTypes));
+    const cameraStore = useCameraStore();
+    const multiCam = ref(cameraStore.camMap.value.size > 1);
 
     return {
       clientSettings,
@@ -41,6 +46,7 @@ export default defineComponent({
       help,
       modes,
       typeList,
+      multiCam,
     };
   },
 });
@@ -208,7 +214,7 @@ export default defineComponent({
           </v-col>
         </v-row>
 
-        <v-row>
+        <v-row v-if="multiCam">
           <v-col class="py-1">
             <v-switch
               v-model="
@@ -235,7 +241,7 @@ export default defineComponent({
                   mdi-help
                 </v-icon>
               </template>
-              <span>Help</span>
+              <span>{{ help.stereoMatching }}</span>
             </v-tooltip>
           </v-col>
         </v-row>
diff --git a/client/dive-common/components/Viewer.vue b/client/dive-common/components/Viewer.vue
index 9f2e2e85a..dc1a32b59 100644
--- a/client/dive-common/components/Viewer.vue
+++ b/client/dive-common/components/Viewer.vue
@@ -48,8 +48,8 @@ import context from 'dive-common/store/context';
 import { EditAnnotationTypes, VisibleAnnotationTypes } from 'vue-media-annotator/layers';
 import { TrackWithContext } from 'vue-media-annotator/BaseFilterControls';
 import TrackViewer from 'vue-media-annotator/components/track_3d_viewer/TrackViewer.vue';
-import TrackViewerSettings from 'vue-media-annotator/components/track_3d_viewer/TrackViewerSettings.vue';
 import TrackViewerSettingsStore from 'vue-media-annotator/components/track_3d_viewer/TrackViewerSettingsStore';
+import TrackViewerSettings from 'vue-media-annotator/components/track_3d_viewer/TrackViewerSettings.vue';
 import GroupSidebarVue from './GroupSidebar.vue';
 import MultiCamToolsVue from './MultiCamTools.vue';
 
@@ -93,7 +93,8 @@ export default defineComponent({
     const { prompt } = usePrompt();
     const loadError = ref('');
 
-    const tracks3d = ref(false);
+    const showTrack3dViewer = ref(false);
+    const isStereoConfigMode = ref(false);
 
     const baseMulticamDatasetId = ref(null as string | null);
     const datasetId = toRef(props, 'id');
@@ -529,6 +530,9 @@ export default defineComponent({
         // Close and reset sideBar
         context.resetActive();
         const meta = await loadMetadata(datasetId.value);
+
+        isStereoConfigMode.value = meta.stereoConfigurationFile != null;
+
         const defaultCameraMeta = meta.multiCamMedia?.cameras[meta.multiCamMedia.defaultDisplay];
         baseMulticamDatasetId.value = datasetId.value;
         if (defaultCameraMeta !== undefined && meta.multiCamMedia) {
@@ -545,6 +549,8 @@ export default defineComponent({
         /* Otherwise, complete loading of the dataset */
         trackStyleManager.populateTypeStyles(meta.customTypeStyling);
         groupStyleManager.populateTypeStyles(meta.customGroupStyling);
+
+
         if (meta.customTypeStyling) {
           trackFilters.importTypes(Object.keys(meta.customTypeStyling), false);
         }
@@ -640,6 +646,18 @@ export default defineComponent({
             component: GroupSidebarVue,
           });
         }
+
+        if (meta.stereoConfigurationFile) {
+          context.register({
+            component: TrackViewerSettings,
+            description: 'Track Viewer Settings',
+          });
+        } else {
+          context.unregister({
+            component: TrackViewerSettings,
+            description: 'Track Viewer Settings',
+          });
+        }
       } catch (err) {
         progress.loaded = false;
         console.error(err);
@@ -771,6 +789,12 @@ export default defineComponent({
       });
     }
 
+    // trigger resize of the annotator on track 3d viewer toggling
+    watch(showTrack3dViewer, async () => {
+      await nextTick();
+      onResize();
+    });
+
     provideAnnotator(
       {
         annotatorPreferences: toRef(clientSettings, 'annotatorPreferences'),
@@ -857,7 +881,8 @@ export default defineComponent({
       onTrackAdded,
       onGeometryAdded,
       datasetId,
-      tracks3d,
+      showTrack3dViewer,
+      isStereoConfigMode,
     };
   },
 });
@@ -936,12 +961,19 @@ export default defineComponent({
           </template>
         </v-select>
 
-        <v-btn
-          color="secondary"
-          @click="tracks3d = !tracks3d"
-        >
-          Toggle 3d
-        </v-btn>
+        <template v-if="isStereoConfigMode">
+          <v-divider
+            vertical
+            class="mx-2"
+          />
+
+          <v-switch
+            v-model="showTrack3dViewer"
+            label="Track 3D Viewer"
+            color="primary"
+            hide-details
+          />
+        </template>
 
         <v-divider
           vertical
@@ -1035,7 +1067,7 @@ export default defineComponent({
             :style="{ 'max-height': `calc(100% - ${controlsHeight}px)` }"
           >
             <div
-              v-if="tracks3d"
+              v-if="showTrack3dViewer"
               :style="{ height: '50%', width: '100%', 'flex-basis': '100%' }"
             >
               <track-viewer :controls-height="controlsHeight" />
@@ -1045,7 +1077,7 @@ export default defineComponent({
               v-for="camera in multiCamList"
               :key="camera"
               class="d-flex flex-column grow"
-              :style="tracks3d ? { height: '50%' } : { height: '100%' }"
+              :style="showTrack3dViewer ? { height: '50%' } : { height: '100%' }"
               @mousedown.left="changeCamera(camera, $event)"
               @mouseup.right="changeCamera(camera, $event)"
             >
diff --git a/client/platform/desktop/frontend/components/Recent.vue b/client/platform/desktop/frontend/components/Recent.vue
index f98f67ffd..a4a27ee16 100644
--- a/client/platform/desktop/frontend/components/Recent.vue
+++ b/client/platform/desktop/frontend/components/Recent.vue
@@ -2,7 +2,7 @@
 import { join } from 'path';
 import moment from 'moment';
 import {
-  computed, defineComponent, ref, Ref, reactive,
+  computed, defineComponent, ref, Ref,
 } from '@vue/composition-api';
 
 import type { DatasetType, MultiCamImportArgs } from 'dive-common/apispec';