multicamera unclamping (#1252)

* multicamera unclamping * fixing type error * mend * changing default camera text Co-authored-by: BryonCLewis <[email protected]>
Kitware · May 31, 2022 · 6fae2f6 · 6fae2f6
1 parent e8dcd95
commit 6fae2f6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/client/dive-common/components/ImportMultiCamDialog.vue b/client/dive-common/components/ImportMultiCamDialog.vue
@@ -424,8 +424,7 @@ export default defineComponent({
           outlined
           dense
         >
-          Visualization currently doesn't support multi views so please choose
-          a list of images or video to display by default when viewing
+          Please choose the camera which will be selected by default when the loading the dataset.
         </v-alert>
         <div>
           <div>

diff --git a/client/src/components/annotators/useMediaController.ts b/client/src/components/annotators/useMediaController.ts
@@ -258,9 +258,15 @@ export function useMediaController() {
         // 4x zoom max
         max: 4,
       });
-      geoViewerRef.value.clampBoundsX(true);
-      geoViewerRef.value.clampBoundsY(true);
-      geoViewerRef.value.clampZoom(true);
+      if (Object.keys(geoViewers).length === 1) {
+        geoViewerRef.value.clampBoundsX(true);
+        geoViewerRef.value.clampBoundsY(true);
+        geoViewerRef.value.clampZoom(true);
+      } else {
+        geoViewerRef.value.clampBoundsX(false);
+        geoViewerRef.value.clampBoundsY(false);
+        geoViewerRef.value.clampZoom(false);
+      }
       resetZoom();
     }
 

diff --git a/server/dive_utils/__init__.py b/server/dive_utils/__init__.py
@@ -61,7 +61,7 @@ def strNumericCompare(input1: str, input2: str) -> int:
             return -1
         if type(b) == int:
             return 1
-        return 1 if a > b else -1
+        return 1 if str(a) > str(b) else -1
     return 0
 
 

diff --git a/server/dive_utils/serializers/meva.py b/server/dive_utils/serializers/meva.py
@@ -43,7 +43,7 @@ def load_kpf_as_tracks(readers: List[Iterable[ByteString]]):
     error_report: Dict[str, str] = {}
     try:
         for reader in readers:
-            rows = b"".join(list(reader)).decode("utf-8")
+            rows = ''.join([str(elem) for elem in reader])
             yml = kpf.load_yaml(rows)
             for row in yml:
                 if kpf.TYPES in row: