Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CVAT-3D Milestone2 #2645

Merged
merged 76 commits into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
a40d8dd
CVAT-3D Updated the Mime Types with Bin Support, added dependency of …
Dec 7, 2020
6bcac4a
CVAT-3D Added additional column as Dimension for engine_task table an…
Dec 7, 2020
db27800
Added Support for 3D file Upload in BIN and PCD.
Dec 7, 2020
7f89251
Added Dimension attribute defaulting to 2D for importer and exporter.
Dec 7, 2020
0fd3742
Added props passing for dimension attribute, filtering of import, Mig…
Dec 7, 2020
3be8ef9
Modified code as per review comments
Dec 14, 2020
6357751
Updated Unit test cases for 3D task creation
Dec 14, 2020
6baeed3
Refactored Dimension Enum in UI and backend code
Dec 16, 2020
d0c9b4f
Merging dev code with branch code
Dec 16, 2020
13cd5ff
Resolving conflicts
Dec 16, 2020
5be4b3d
Updated Unit Test Case
Dec 16, 2020
9175c07
Refactored TaskDimension to DimensionType, Simplified usage of Dimens…
Dec 18, 2020
a9972e1
Removing manually created test files
Dec 18, 2020
0877de4
Removing old pcd mime-type mapping
Dec 18, 2020
da61f90
Added test files generated by synthetic data using open3d
Dec 22, 2020
5e302c6
Merge branch 'develop' into cvat-3D-M1
Dec 23, 2020
2fd3282
Merged with develop branch latest changes
Dec 23, 2020
9432068
Added libraries required for open3d
Dec 23, 2020
5675d7c
Added files
Dec 23, 2020
d14226a
Added synthethic pcd,bin and img test files
Dec 23, 2020
733e4bb
Modified test file name
Dec 24, 2020
fc5cf64
Merge branch 'develop' into cvat-3D-M1
Dec 24, 2020
45d276f
Trigger travis ci
Dec 24, 2020
6c0d765
Modified test case to ignore 3D preview images
Dec 24, 2020
86c7494
Trigger notification
Dec 24, 2020
7c3017d
Merge branch 'develop' into cvat-3D-M1
Dec 25, 2020
768a17e
Deleting DS Store files
Dec 25, 2020
6879381
Modified test cases as per review comments
Dec 25, 2020
f0217ca
Merge branch 'develop' into cvat-3D-M1
Dec 30, 2020
2af7627
Checking pre-commit hook
Dec 30, 2020
4b61eb4
Fixed Lint issues - precommit hook verification
Dec 30, 2020
bae77fc
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
Jan 5, 2021
0a47529
Added changes for CVAT-3D Milestone2 changes - Frame Navigation, phot…
Jan 5, 2021
2b5d997
Modified changes
Jan 5, 2021
4720578
Added canvas3D for 3D Perspective
Jan 5, 2021
66c9a25
Added missing files
Jan 5, 2021
284e783
Added code to get image context for 3D view
Jan 5, 2021
68ec5b2
Codacy check for stylesheet
Jan 5, 2021
6461fdd
Modified frame navigantion for 3D View
Jan 6, 2021
2ef6d7c
Modified style for context-image
Jan 6, 2021
605b2c9
Trigger notification
Jan 6, 2021
f24a157
Added Support for 3D file Upload in BIN and PCD.
Dec 7, 2020
9012756
Added props passing for dimension attribute, filtering of import, Mig…
Dec 7, 2020
6f0ccb2
Modified code as per review comments
Dec 14, 2020
d7ff4e7
Refactored Dimension Enum in UI and backend code
Dec 16, 2020
18bacda
Merged with develop branch latest changes
Dec 23, 2020
b3c812f
Added files
Dec 23, 2020
36d5a8c
Added changes for CVAT-3D Milestone2 changes - Frame Navigation, phot…
Jan 5, 2021
28e9a23
Modified changes
Jan 5, 2021
12cc4e5
Added canvas3D for 3D Perspective
Jan 5, 2021
e94fe57
Added missing files
Jan 5, 2021
6d6b94b
Added code to get image context for 3D view
Jan 5, 2021
aaa76a4
Codacy check for stylesheet
Jan 5, 2021
99de3a8
Modified frame navigantion for 3D View
Jan 6, 2021
42419e3
Modified style for context-image
Jan 6, 2021
342508c
Merged develop branch code
Jan 11, 2021
deb6fe9
Changed cvat-data lint issues
Jan 11, 2021
15d584b
Modified to use opencv as per review comments
Jan 13, 2021
190a81b
Removed unwanted imports
Jan 13, 2021
a977551
Fixed css and added usage of hooks
Jan 22, 2021
f91ef22
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
Jan 27, 2021
1a328a5
Merged Develop branch code
Jan 28, 2021
84ac9d3
Removed unused data structures
Jan 29, 2021
c1ae3db
Removed unused data structures
Jan 29, 2021
369470b
Refactored unused data structures
Jan 29, 2021
1cc14be
Merge branch 'cvat-3D-M2' of https://github.com/manasars/cvat into cv…
Jan 29, 2021
3ff9674
Added three js dependency in cvat ui package-lock.json
Jan 29, 2021
c8eba08
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
Feb 1, 2021
bccdc82
Merged develop branch code and refactored code
Feb 1, 2021
bec220f
Fixed snyk issue
Feb 1, 2021
374beec
Modified Camera Icon in photo-context
Feb 1, 2021
b357436
Update icons.tsx
manasars Feb 1, 2021
cb99ff4
Remove unused svg file
Feb 2, 2021
3d53bd5
Merge branch 'cvat-3D-M2' of https://github.com/manasars/cvat into cv…
Feb 2, 2021
38a9b3f
Modified changelog file
Feb 2, 2021
5d83d4d
Resolving conflicts from develop branch merge
Feb 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Dockerfile.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions cvat-canvas3d/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
webpack.config.js
46 changes: 46 additions & 0 deletions cvat-canvas3d/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -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'],
},
},
},
};
2 changes: 2 additions & 0 deletions cvat-canvas3d/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
src/*.js
manasars marked this conversation as resolved.
Show resolved Hide resolved
dist
49 changes: 49 additions & 0 deletions cvat-canvas3d/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Module CVAT-CANVAS-3D

## Description

The CVAT module written in TypeScript language.
manasars marked this conversation as resolved.
Show resolved Hide resolved
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, objectStates: any[], zLayer?: number): void;
fitCanvas(): void;
mode(): Mode;
configure(configuration: Configuration): void;
bsekachev marked this conversation as resolved.
Show resolved Hide resolved
}
```

### 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();
```
Loading