CVAT-3D Milestone1

cvat-core/src/annotation-formats.js

@@ -15,6 +15,7 @@
                 format: initialData.ext,
                 version: initialData.version,
                 enabled: initialData.enabled,
+                dimension: initialData.dimension
             };
 
             Object.defineProperties(this, {
@@ -58,6 +59,16 @@
                      */
                     get: () => data.enabled,
                 },
+                dimension: {
+                    /**
+                     * @name dimension
+                     * @type {string}
+                     * @memberof module:API.cvat.classes.Loader
+                     * @readonly
+                     * @instance
+                     */
+                    get: () => data.dimension,
+                },
             });
         }
     }
@@ -74,6 +85,7 @@
                 format: initialData.ext,
                 version: initialData.version,
                 enabled: initialData.enabled,
+                dimension: initialData.dimension
             };
 
             Object.defineProperties(this, {
@@ -117,6 +129,16 @@
                      */
                     get: () => data.enabled,
                 },
+                dimension: {
+                    /**
+                     * @name dimension
+                     * @type {string}
+                     * @memberof module:API.cvat.classes.Loader
+                     * @readonly
+                     * @instance
+                     */
+                    get: () => data.dimension,
+                },
             });
         }
     }

cvat-core/src/api-implementation.js

@@ -176,6 +176,7 @@
                 search: isString,
                 status: isEnum.bind(TaskStatus),
                 mode: isEnum.bind(TaskMode),
+                dimension: isString
             });
 
             if ('search' in filter && Object.keys(filter).length > 1) {
@@ -198,7 +199,7 @@
             }
 
             const searchParams = new URLSearchParams();
-            for (const field of ['name', 'owner', 'assignee', 'search', 'status', 'mode', 'id', 'page', 'projectId']) {
+            for (const field of ['name', 'owner', 'assignee', 'search', 'status', 'mode', 'id', 'page', 'projectId', 'dimension']) {
                 if (Object.prototype.hasOwnProperty.call(filter, field)) {
                     searchParams.set(field, filter[field]);
                 }

cvat-core/src/session.js

@@ -974,6 +974,7 @@
                 use_zip_chunks: undefined,
                 use_cache: undefined,
                 copy_data: undefined,
+                dimension: undefined
             };
 
             let updatedFields = {
@@ -1452,6 +1453,16 @@
                             updatedFields = fields;
                         },
                     },
+                    dimension: {
+                    /**
+                     * @name enabled
+                     * @type {string}
+                     * @memberof module:API.cvat.classes.Loader
+                     * @readonly
+                     * @instance
+                     */
+                    get: () => data.dimension,
+                },
                 }),
             );
 

cvat-ui/src/components/actions-menu/actions-menu.tsx

@@ -21,7 +21,7 @@ interface Props {
     dumpActivities: string[] | null;
     exportActivities: string[] | null;
     inferenceIsActive: boolean;
-
+    taskDimension: string;
     onClickMenu: (params: ClickParam, file?: File) => void;
 }
 
@@ -46,6 +46,7 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
         dumpActivities,
         exportActivities,
         loadActivity,
+        taskDimension,
     } = props;
 
     let latestParams: ClickParam | null = null;
@@ -99,6 +100,7 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
                 dumpers,
                 dumpActivities,
                 menuKey: Actions.DUMP_TASK_ANNO,
+                taskDimension,
             })}
             {LoadSubmenu({
                 loaders,
@@ -107,11 +109,13 @@ export default function ActionsMenuComponent(props: Props): JSX.Element {
                     onClickMenuWrapper(null, file);
                 },
                 menuKey: Actions.LOAD_TASK_ANNO,
+                taskDimension,
             })}
             {ExportSubmenu({
                 exporters: dumpers,
                 exportActivities,
                 menuKey: Actions.EXPORT_TASK_DATASET,
+                taskDimension,
             })}
             {!!bugTracker && <Menu.Item key={Actions.OPEN_BUG_TRACKER}>Open bug tracker</Menu.Item>}
             <Menu.Item disabled={inferenceIsActive} key={Actions.RUN_AUTO_ANNOTATION}>

cvat-ui/src/components/actions-menu/dump-submenu.tsx

@@ -19,15 +19,17 @@ interface Props {
     menuKey: string;
     dumpers: any[];
     dumpActivities: string[] | null;
+    taskDimension: string;
 }
 
 export default function DumpSubmenu(props: Props): JSX.Element {
-    const { taskMode, menuKey, dumpers, dumpActivities } = props;
+    const { taskMode, menuKey, dumpers, dumpActivities, taskDimension } = props;
 
     return (
         <Menu.SubMenu key={menuKey} title='Dump annotations'>
             {dumpers
                 .sort((a: any, b: any) => a.name.localeCompare(b.name))
+                .filter((dumper: any): JSX.Element => dumper.dimension === taskDimension)
                 .map(
                     (dumper: any): JSX.Element => {
                         const pending = (dumpActivities || []).includes(dumper.name);

cvat-ui/src/components/actions-menu/export-submenu.tsx

@@ -11,15 +11,17 @@ interface Props {
     menuKey: string;
     exporters: any[];
     exportActivities: string[] | null;
+    taskDimension: string;
 }
 
 export default function ExportSubmenu(props: Props): JSX.Element {
-    const { menuKey, exporters, exportActivities } = props;
+    const { menuKey, exporters, exportActivities, taskDimension } = props;
 
     return (
         <Menu.SubMenu key={menuKey} title='Export as a dataset'>
             {exporters
                 .sort((a: any, b: any) => a.name.localeCompare(b.name))
+                .filter((exporter: any): JSX.Element => exporter.dimension === taskDimension)
                 .map(
                     (exporter: any): JSX.Element => {
                         const pending = (exportActivities || []).includes(exporter.name);

cvat-ui/src/components/actions-menu/load-submenu.tsx

@@ -14,15 +14,17 @@ interface Props {
     loaders: any[];
     loadActivity: string | null;
     onFileUpload(file: File): void;
+    taskDimension: string;
 }
 
 export default function LoadSubmenu(props: Props): JSX.Element {
-    const { menuKey, loaders, loadActivity, onFileUpload } = props;
+    const { menuKey, loaders, loadActivity, onFileUpload, taskDimension } = props;
 
     return (
         <Menu.SubMenu key={menuKey} title='Upload annotations'>
             {loaders
                 .sort((a: any, b: any) => a.name.localeCompare(b.name))
+                .filter((loader: any): JSX.Element => loader.dimension === taskDimension)
                 .map(
                     (loader: any): JSX.Element => {
                         const accept = loader.format

cvat-ui/src/components/model-runner-modal/detector-runner.tsx

@@ -118,7 +118,8 @@ function DetectorRunner(props: Props): JSX.Element {
                 <Col span={4}>Model:</Col>
                 <Col span={20}>
                     <Select
-                        placeholder='Select a model'
+                        placeholder={task.dimension ==='2d'?'Select a model' : "No model available"}
+                        disabled = {task.dimension !== '2d'}
                         style={{ width: '100%' }}
                         onChange={(_modelID: string): void => {
                             const newmodel = models.filter((_model): boolean => _model.id === _modelID)[0];

cvat-ui/src/containers/actions-menu/actions-menu.tsx

@@ -136,6 +136,7 @@ function ActionsMenuContainer(props: OwnProps & StateToProps & DispatchToProps):
             exportActivities={exportActivities}
             inferenceIsActive={inferenceIsActive}
             onClickMenu={onClickMenu}
+            taskDimension={taskInstance.dimension}
         />
     );
 }

cvat/apps/dataset_manager/formats/registry.py

@@ -23,7 +23,7 @@ class Importer(_Format):
     def __call__(self, src_file, task_data, **options):
         raise NotImplementedError()
 
-def _wrap_format(f_or_cls, klass, name, version, ext, display_name, enabled):
+def _wrap_format(f_or_cls, klass, name, version, ext, display_name, enabled, dimension="2d"):
     import inspect
     assert inspect.isclass(f_or_cls) or inspect.isfunction(f_or_cls)
     if inspect.isclass(f_or_cls):
@@ -45,29 +45,30 @@ def __call__(self, *args, **kwargs):
     target.DISPLAY_NAME = (display_name or klass.DISPLAY_NAME).format(
         NAME=name, VERSION=version, EXT=ext)
     assert all([target.NAME, target.VERSION, target.EXT, target.DISPLAY_NAME])
+    target.DIMENSION = dimension
     target.ENABLED = enabled
 
     return target
 
 EXPORT_FORMATS = {}
-def exporter(name, version, ext, display_name=None, enabled=True):
+def exporter(name, version, ext, display_name=None, enabled=True, dimension="2d"):
     assert name not in EXPORT_FORMATS, "Export format '%s' already registered" % name
     def wrap_with_params(f_or_cls):
         t = _wrap_format(f_or_cls, Exporter,
             name=name, ext=ext, version=version, display_name=display_name,
-            enabled=enabled)
+            enabled=enabled, dimension=dimension)
         key = t.DISPLAY_NAME
         assert key not in EXPORT_FORMATS, "Export format '%s' already registered" % name
         EXPORT_FORMATS[key] = t
         return t
     return wrap_with_params
 
 IMPORT_FORMATS = {}
-def importer(name, version, ext, display_name=None, enabled=True):
+def importer(name, version, ext, display_name=None, enabled=True, dimension="2d"):
     def wrap_with_params(f_or_cls):
         t = _wrap_format(f_or_cls, Importer,
             name=name, ext=ext, version=version, display_name=display_name,
-            enabled=enabled)
+            enabled=enabled, dimension=dimension)
         key = t.DISPLAY_NAME
         assert key not in IMPORT_FORMATS, "Import format '%s' already registered" % name
         IMPORT_FORMATS[key] = t
@@ -91,4 +92,4 @@ def make_exporter(name):
 import cvat.apps.dataset_manager.formats.pascal_voc
 import cvat.apps.dataset_manager.formats.tfrecord
 import cvat.apps.dataset_manager.formats.yolo
-import cvat.apps.dataset_manager.formats.imagenet
+import cvat.apps.dataset_manager.formats.imagenet

cvat/apps/dataset_manager/serializers.py

@@ -10,6 +10,7 @@ class DatasetFormatSerializer(serializers.Serializer):
     ext = serializers.CharField(max_length=64, source='EXT')
     version = serializers.CharField(max_length=64, source='VERSION')
     enabled = serializers.BooleanField(source='ENABLED')
+    dimension = serializers.CharField(max_length=64, source='DIMENSION')
 
 class DatasetFormatsSerializer(serializers.Serializer):
     importers = DatasetFormatSerializer(many=True)

cvat/apps/engine/media.mimetypes

@@ -107,6 +107,7 @@ image/jp2	jp2
 image/x-portable-bitmap	pbm
 image/x-eps	epsf
 image/x-photo-cd	pcd
+image/bin	bin
 image/jpeg	jpe
 image/jp2	jpf
 image/jpeg	jpg