Skip to content

Commit 6fae2f6

Browse files
authored
multicamera unclamping (#1252)
* multicamera unclamping * fixing type error * mend * changing default camera text Co-authored-by: BryonCLewis <BryonCLewis@gmail.com>
1 parent e8dcd95 commit 6fae2f6

4 files changed

Lines changed: 12 additions & 7 deletions

File tree

client/dive-common/components/ImportMultiCamDialog.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,7 @@ export default defineComponent({
424424
outlined
425425
dense
426426
>
427-
Visualization currently doesn't support multi views so please choose
428-
a list of images or video to display by default when viewing
427+
Please choose the camera which will be selected by default when the loading the dataset.
429428
</v-alert>
430429
<div>
431430
<div>

client/src/components/annotators/useMediaController.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,15 @@ export function useMediaController() {
258258
// 4x zoom max
259259
max: 4,
260260
});
261-
geoViewerRef.value.clampBoundsX(true);
262-
geoViewerRef.value.clampBoundsY(true);
263-
geoViewerRef.value.clampZoom(true);
261+
if (Object.keys(geoViewers).length === 1) {
262+
geoViewerRef.value.clampBoundsX(true);
263+
geoViewerRef.value.clampBoundsY(true);
264+
geoViewerRef.value.clampZoom(true);
265+
} else {
266+
geoViewerRef.value.clampBoundsX(false);
267+
geoViewerRef.value.clampBoundsY(false);
268+
geoViewerRef.value.clampZoom(false);
269+
}
264270
resetZoom();
265271
}
266272

server/dive_utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def strNumericCompare(input1: str, input2: str) -> int:
6161
return -1
6262
if type(b) == int:
6363
return 1
64-
return 1 if a > b else -1
64+
return 1 if str(a) > str(b) else -1
6565
return 0
6666

6767

server/dive_utils/serializers/meva.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def load_kpf_as_tracks(readers: List[Iterable[ByteString]]):
4343
error_report: Dict[str, str] = {}
4444
try:
4545
for reader in readers:
46-
rows = b"".join(list(reader)).decode("utf-8")
46+
rows = ''.join([str(elem) for elem in reader])
4747
yml = kpf.load_yaml(rows)
4848
for row in yml:
4949
if kpf.TYPES in row:

0 commit comments

Comments
 (0)