From 4aa14e74dceb3935b01a9bbf79c8c1849490b309 Mon Sep 17 00:00:00 2001 From: Mathis Chenuet Date: Sat, 18 Jul 2020 08:17:06 +0200 Subject: [PATCH] Match image by name (instead of id) on CVAT upload (#1807) * Match image by name (instead of id) on CVAT upload * Use match_dm_item --- cvat/apps/dataset_manager/formats/cvat.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cvat/apps/dataset_manager/formats/cvat.py b/cvat/apps/dataset_manager/formats/cvat.py index ddd81be2..a510582c 100644 --- a/cvat/apps/dataset_manager/formats/cvat.py +++ b/cvat/apps/dataset_manager/formats/cvat.py @@ -9,8 +9,10 @@ from collections import OrderedDict from glob import glob from tempfile import TemporaryDirectory +from cvat.apps.dataset_manager.bindings import match_dm_item from cvat.apps.dataset_manager.util import make_zip_archive from cvat.apps.engine.frame_provider import FrameProvider +from datumaro.components.extractor import DatasetItem from datumaro.util.image import save_image from .registry import exporter, importer @@ -432,7 +434,7 @@ def load(file_object, annotations): ) elif el.tag == 'image': image_is_opened = True - frame_id = int(el.attrib['id']) + frame_id = match_dm_item(DatasetItem(id=el.attrib['id'], image=el.attrib['name']), annotations) elif el.tag in supported_shapes and (track is not None or image_is_opened): attributes = [] shape = { @@ -555,4 +557,4 @@ def _import(src_file, task_data): for p in anno_paths: load(p, task_data) else: - load(src_file, task_data) \ No newline at end of file + load(src_file, task_data)