CVAT-3D Milestone2 (#2645)

* CVAT-3D Updated the Mime Types with Bin Support, added dependency of open3D * CVAT-3D Added additional column as Dimension for engine_task table and created a relatedfiles table for PCD to Image mapping. * Added Support for 3D file Upload in BIN and PCD. * Added Dimension attribute defaulting to 2D for importer and exporter. * Added props passing for dimension attribute, filtering of import, Migration Scripts and Dimension attribute for MpegChunk Writers * Modified code as per review comments * Updated Unit test cases for 3D task creation * Refactored Dimension Enum in UI and backend code * Resolving conflicts * Updated Unit Test Case * Refactored TaskDimension to DimensionType, Simplified usage of Dimension accross classes * Removing manually created test files * Removing old pcd mime-type mapping * Added test files generated by synthetic data using open3d * Merged with develop branch latest changes * Added libraries required for open3d * Added files * Added synthethic pcd,bin and img test files * Modified test file name * Trigger travis ci * Modified test case to ignore 3D preview images * Trigger notification * Deleting DS Store files * Modified test cases as per review comments * Checking pre-commit hook * Fixed Lint issues - precommit hook verification * Added changes for CVAT-3D Milestone2 changes - Frame Navigation, photo context hide and show * Modified changes * Added canvas3D for 3D Perspective * Added missing files * Added code to get image context for 3D view * Codacy check for stylesheet * Modified frame navigantion for 3D View * Modified style for context-image * Trigger notification * Added Support for 3D file Upload in BIN and PCD. * Added props passing for dimension attribute, filtering of import, Migration Scripts and Dimension attribute for MpegChunk Writers * Modified code as per review comments * Refactored Dimension Enum in UI and backend code * Merged with develop branch latest changes * Added files * Added changes for CVAT-3D Milestone2 changes - Frame Navigation, photo context hide and show * Modified changes * Added canvas3D for 3D Perspective * Added missing files * Added code to get image context for 3D view * Codacy check for stylesheet * Modified frame navigantion for 3D View * Modified style for context-image * Changed cvat-data lint issues * Modified to use opencv as per review comments * Removed unwanted imports * Fixed css and added usage of hooks * Merged Develop branch code * Removed unused data structures * Removed unused data structures * Refactored unused data structures * Added three js dependency in cvat ui package-lock.json * Merged develop branch code and refactored code * Fixed snyk issue * Modified Camera Icon in photo-context * Update icons.tsx * Remove unused svg file * Modified changelog file Co-authored-by: cdp <cdp123>
cvat-ai · Feb 5, 2021 · 5c67846 · 5c67846
1 parent 71e2ddb
commit 5c67846
Show file tree

Hide file tree

Showing 48 changed files with 12,798 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - CVAT-3D: support lidar data on the server side (<https://github.com/openvinotoolkit/cvat/pull/2534>)
+- CVAT-3D: Load all frames corresponding to the job instance
+ (<https://github.com/openvinotoolkit/cvat/pull/2645>)
 - Intelligent scissors with OpenCV javascript (<https://github.com/openvinotoolkit/cvat/pull/2689>)
 
 ### Changed

diff --git a/Dockerfile.ui b/Dockerfile.ui
@@ -20,6 +20,7 @@ RUN apk add python3 g++ make
 # Install dependencies
 COPY cvat-core/package*.json /tmp/cvat-core/
 COPY cvat-canvas/package*.json /tmp/cvat-canvas/
+COPY cvat-canvas3d/package*.json /tmp/cvat-canvas3d/
 COPY cvat-ui/package*.json /tmp/cvat-ui/
 COPY cvat-data/package*.json /tmp/cvat-data/
 
@@ -35,13 +36,18 @@ RUN npm ci
 WORKDIR /tmp/cvat-canvas/
 RUN npm ci
 
+# Install cvat-canvas dependencies
+WORKDIR /tmp/cvat-canvas3d/
+RUN npm ci
+
 # Install cvat-ui dependencies
 WORKDIR /tmp/cvat-ui/
 RUN npm ci
 
 # Build source code
 COPY cvat-data/ /tmp/cvat-data/
 COPY cvat-core/ /tmp/cvat-core/
+COPY cvat-canvas3d/ /tmp/cvat-canvas3d/
 COPY cvat-canvas/ /tmp/cvat-canvas/
 COPY cvat-ui/ /tmp/cvat-ui/
 RUN npm run build

diff --git a/cvat-canvas3d/.eslintignore b/cvat-canvas3d/.eslintignore
@@ -0,0 +1 @@
+webpack.config.js
diff --git a/cvat-canvas3d/.eslintrc.js b/cvat-canvas3d/.eslintrc.js
@@ -0,0 +1,46 @@
+// Copyright (C) 2021 Intel Corporation
+//
+// SPDX-License-Identifier: MIT
+
+module.exports = {
+ env: {
+ node: true,
+ },
+ parserOptions: {
+ parser: '@typescript-eslint/parser',
+ ecmaVersion: 6,
+ },
+ plugins: ['@typescript-eslint', 'import'],
+ extends: [
+ 'plugin:@typescript-eslint/recommended',
+ 'airbnb-typescript/base',
+ 'plugin:import/errors',
+ 'plugin:import/warnings',
+ 'plugin:import/typescript',
+ ],
+ rules: {
+ '@typescript-eslint/no-explicit-any': 0,
+ '@typescript-eslint/indent': ['warn', 4],
+ 'no-plusplus': 0,
+ 'no-restricted-syntax': [
+ 0,
+ {
+ selector: 'ForOfStatement',
+ },
+ ],
+ 'max-len': ['error', { code: 120 }],
+ 'no-continue': 0,
+ 'func-names': 0,
+ 'no-console': 0, // this rule deprecates console.log, console.warn etc. because 'it is not good in production code'
+ 'lines-between-class-members': 0,
+ 'import/prefer-default-export': 0, // works incorrect with interfaces
+ 'newline-per-chained-call': 0, // makes code uglier
+ },
+ settings: {
+ 'import/resolver': {
+ node: {
+ extensions: ['.ts', '.js', '.json'],
+ },
+ },
+ },
+};
diff --git a/cvat-canvas3d/.gitignore b/cvat-canvas3d/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/cvat-canvas3d/README.md b/cvat-canvas3d/README.md
@@ -0,0 +1,50 @@
+# Module CVAT-CANVAS-3D
+
+## Description
+
+The CVAT module written in TypeScript language.
+It presents a canvas to viewing, drawing and editing of 3D annotations.
+
+## Versioning
+
+If you make changes in this package, please do following:
+
+- After not important changes (typos, backward compatible bug fixes, refactoring) do: `npm version patch`
+- After changing API (backward compatible new features) do: `npm version minor`
+- After changing API (changes that break backward compatibility) do: `npm version major`
+
+## Commands
+
+- Building of the module from sources in the `dist` directory:
+
+```bash
+npm run build
+npm run build -- --mode=development # without a minification
+```
+
+### API Methods
+
+```ts
+interface Canvas3d {
+ html(): HTMLDivElement;
+ setup(frameData: any): void;
+ fitCanvas(): void;
+ mode(): Mode;
+ isAbleToChangeFrame(): boolean;
+ render(): void;
+}
+```
+
+### WEB
+
+```js
+// Create an instance of a canvas
+const canvas = new window.canvas.Canvas3d();
+
+console.log('Version ', window.canvas.CanvasVersion);
+console.log('Current mode is ', window.canvas.mode());
+
+// Put canvas to a html container
+htmlContainer.appendChild(canvas.html());
+canvas.fitCanvas();
+```