Display of Annotation Type #1192

Priya4607 · 2020-02-25T12:39:16Z

This PR adds a feature which can help the user distinguish which of the boxes are auto-annotated. When a user annotates an image it is marked as (MANUAL) in each of the boxes created and in case of auto-annotation it is marked as (AUTO). When the user edits a auto-generated box it is changed from (AUTO) to (MANUAL).

This currently works in case of auto-annotation using TF Object Detection API
In case of undo/redo operations, there is a need to click the button twice to restore the changes.

nmanovic · 2020-02-27T10:58:53Z

@Priya4607 ,

First of all please fix codacy and build (probably you forgot to add migrations). Please check that the patch works in case of undo/redo, propagation, ... When you ready please remove WIP from the patch and we will review and provide feedback.

nmanovic · 2020-03-05T05:59:21Z

@azhavoro , could you please review and give your opinion.

azhavoro

Thanks for the contribution.
I have question:
What do you think about support of this field for export/import annotations functionality (CVAT format only). For now if I dump and upload anno again I will completely lose auto/manual field for all objects, right?

cvat/apps/engine/models.py

nmanovic

@Priya4607 , we have a conflict. Could you please resolve it?

@azhavoro , could you please summarise all your comments into a check list? Thus it will be easy to understand where we are with the PR.

azhavoro · 2020-03-19T12:43:45Z

@Priya4607 thank you for the update
Summarized comments:

Add support annotation type for tags
Support annotation_type field for CVAT XML dump/upload
Fix unit tests & travis build
Squash migrations to one file
Add info into CHANGELOG.md

Could you please fix the build and squash all migrations into one file?

…r/loader

cvat/apps/annotation/annotation.py

nmanovic · 2020-04-08T17:58:05Z

@Priya4607 , what is your plans regarding the PR?

Priya4607 · 2020-04-09T05:10:21Z

@nmanovic
I'll do the changes and update the repo

Priya4607 · 2020-04-23T13:02:50Z

@azhavoro, @nmanovic With regard to the PR how shall we proceed further?

azhavoro · 2020-04-23T16:00:07Z

@azhavoro, @nmanovic With regard to the PR how shall we proceed further?

I'll review changes at this week.

cvat/apps/engine/migrations/0026_merge_20200417_1635.py

CHANGELOG.md

azhavoro · 2020-04-26T14:18:32Z

I'm ok with the back-end changes (2 minor comments above).
@Priya4607 could you please fix merge conflict?
@bsekachev could you please review the front-end part?

*added field type for tracks

nmanovic · 2020-06-30T20:33:05Z

@Priya4607 , could you please look at #1767. Do you think you can adapt your changes to the PR? It looks like I will merge it before your PR.

I hope that together we can merge your PR till middle of July. Really appreciate your time and efforts!

nmanovic · 2020-07-13T04:17:02Z

@azhavoro , please work with @Priya4607 to accept the PR. What should be done for that? Could you please preview it again and provide your comments?

azhavoro

@Priya4607 thanks for the PR again!
LGTM

zhiltsov-max

LGTM, but few recently added tests in cvat/apps/dataset_manager/tests/test_annotation.py should be updated.

nmanovic · 2020-07-16T11:54:04Z

cvat/apps/engine/migrations/0026_merge_20200417_1635.py

+        migrations.AlterField(
+            model_name='labeledshape',
+            name='type',
+            field=models.CharField(choices=[('rectangle', 'RECTANGLE'), ('polygon', 'POLYGON'), ('polyline', 'POLYLINE'), ('points', 'POINTS'), ('cuboid', 'CUBOID')], max_length=16),


Why do we have the migration for "type" field here?

Had a migration conflict. So I merged migrations to resolve it.

@Priya4607 , we should have the old migration file and plus new one with only your changes.

When I create a new migration, I get the labeledshape model changes added. I'm not sure how to include my changes alone. Could you provide some suggestions on how to proceed?

@Priya4607 , it was a problem with develp branch. It missed some migrations. I have fixed that. Could you please update and create a new migration?

nmanovic · 2020-07-16T12:02:04Z

cvat/apps/tf_annotation/views.py

@@ -174,6 +174,7 @@ def convert_to_cvat_format(data):
                "group": None,
                "occluded": False,
                "attributes": [],
+                "annotation_type": "Auto",


@Priya4607 , can we rename "annotation_type" into "source". Also I will vote for "auto", "manual" (fist letter should be lower case). In the future we can store in the field even username (or its id).

Okay, should it be applied to both frontend and backend to maintain uniformity?

I think so.

nmanovic · 2020-07-16T12:04:03Z

@Priya4607 , we are ready to merge the PR. Let's do the final minor refactoring, update CHANGELOG.md and I will merge. Thanks for the great idea and contribution.

…_manual

Priya4607 · 2020-07-20T06:53:22Z

LGTM, but few recently added tests in cvat/apps/dataset_manager/tests/test_annotation.py should be updated.

@zhiltsov-max Updated test cases

nmanovic · 2020-07-20T19:42:15Z

CHANGELOG.md

@@ -61,6 +61,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [Datumaro] Added `convert` command to convert datasets directly (<https://github.com/opencv/cvat/pull/1837>)
 - [Datumaro] Added an option to specify image extension when exporting datasets (<https://github.com/opencv/cvat/pull/1799>)
 - [Datumaro] Added image copying when exporting datasets, if possible (<https://github.com/opencv/cvat/pull/1799>)
+- Source type support for tags, shapes and tracks (<https://github.com/opencv/cvat/pull/1192>)


Wrong place. Could you please move these lines into the section for next release?

nmanovic · 2020-07-20T19:47:03Z

@Priya4607 , I'm fine with the PR. Need to fix CHANGELOG.md and I will merge. Thanks!

nmanovic · 2020-07-20T20:01:11Z

Here is an overview of what got changed by this pull request:

Complexity increasing per file
==============================
- cvat/apps/engine/migrations/0027_auto_20200719_1552.py  1
- cvat-core/src/annotations-objects.js  1
         

Clones removed
==============
+ cvat-core/src/annotations-saver.js  -1

See the complete overview on Codacy

nmanovic · 2020-07-23T19:09:28Z

CHANGELOG.md

@@ -467,6 +468,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial version

+## [0.6.1] - 2020-04-14
+### Added
+- Annotation type to determine whether a drawn shape is auto annotated using Tensorflow Object detection API or manually annotated by the user


@Priya4607 , some problems with merge. These lines are wrong.

Removed those lines.

nmanovic · 2020-07-24T09:53:05Z

@Priya4607 , thanks again for the PR. If you can add the information into statistics about the task (aka info), it will be awesome. Thus we can understand number of manual, interpolated and automatic annotated objects.

Priya4607 force-pushed the auto_vs_manual branch from 5ada9a5 to 2712d54 Compare February 26, 2020 09:54

Priya4607 changed the title ~~[WIP] Display of Annotation Type~~ Display of Annotation Type Feb 27, 2020

nmanovic changed the title ~~Display of Annotation Type~~ [WIP] Display of Annotation Type Feb 27, 2020

Priya4607 force-pushed the auto_vs_manual branch from 2712d54 to 0ae7df8 Compare March 3, 2020 11:51

Priya4607 changed the title ~~[WIP] Display of Annotation Type~~ Display of Annotation Type Mar 3, 2020

Priya4607 force-pushed the auto_vs_manual branch from 0ae7df8 to f0303cf Compare March 4, 2020 09:40

azhavoro reviewed Mar 5, 2020

View reviewed changes

cvat/apps/engine/models.py Outdated Show resolved Hide resolved

nmanovic requested changes Mar 17, 2020

View reviewed changes

Priya4607 force-pushed the auto_vs_manual branch from e985dc5 to da8726b Compare March 18, 2020 10:38

Priya4607 added 4 commits March 23, 2020 17:14

resolved merge conflicts

fd3e896

annotation_type field support for tags, tf_annotation api, cvat-dumpe…

1ec2869

…r/loader

unit test fix

98f1fd2

squashed migrations

5c170c8

Priya4607 force-pushed the auto_vs_manual branch from da8726b to 5c170c8 Compare March 23, 2020 11:52

azhavoro requested changes Mar 30, 2020

View reviewed changes

cvat/apps/annotation/annotation.py Outdated Show resolved Hide resolved

Priya4607 added 2 commits April 13, 2020 23:54

updated CHANGELOG.md

732f95c

fixed unit test issues

b79deae

Priya4607 requested a review from bsekachev as a code owner April 13, 2020 18:31

Priya4607 added 2 commits April 17, 2020 22:08

Resolved merge conflicts

cec9060

minor fix

e21c824

Priya4607 requested a review from zhiltsov-max as a code owner April 17, 2020 17:27

azhavoro reviewed Apr 26, 2020

View reviewed changes

cvat/apps/engine/migrations/0026_merge_20200417_1635.py Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

Priya4607 added 3 commits June 30, 2020 16:23

*removed empty migration files

30cda12

*added field type for tracks

resolved conflicts

c1149bf

unit test fix

3695a5d

azhavoro previously approved these changes Jul 13, 2020

View reviewed changes

zhiltsov-max requested changes Jul 16, 2020

View reviewed changes

nmanovic reviewed Jul 16, 2020

View reviewed changes

Priya4607 added 3 commits July 16, 2020 20:51

resolved conflicts

adf086d

Merge branch 'develop' of https://github.com/opencv/cvat into auto_vs…

f34ba1f

…_manual

minor changes

cccecb0

Priya4607 dismissed azhavoro’s stale review via cccecb0 July 18, 2020 11:03

Priya4607 added 2 commits July 19, 2020 21:22

Merge branch 'develop' of https://github.com/opencv/cvat into auto_vs…

58e41fa

…_manual

included migrations

3513fe7

zhiltsov-max previously approved these changes Jul 20, 2020

View reviewed changes

nmanovic reviewed Jul 20, 2020

View reviewed changes

updated CHANGELOG.md

c3590a1

Priya4607 dismissed zhiltsov-max’s stale review via c3590a1 July 20, 2020 19:58

nmanovic reviewed Jul 23, 2020

View reviewed changes

updated CHANGELOG.md

562ea5f

nmanovic approved these changes Jul 24, 2020

View reviewed changes

nmanovic merged commit 6a1e7af into cvat-ai:develop Jul 24, 2020

bsekachev mentioned this pull request Jul 24, 2020

Fixed default undefined, fixed double change #1935

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display of Annotation Type #1192

Display of Annotation Type #1192

Priya4607 commented Feb 25, 2020 •

edited

Loading

nmanovic commented Feb 27, 2020

nmanovic commented Mar 5, 2020

azhavoro left a comment

nmanovic left a comment

azhavoro commented Mar 19, 2020 •

edited

Loading

nmanovic commented Apr 8, 2020

Priya4607 commented Apr 9, 2020

Priya4607 commented Apr 23, 2020

azhavoro commented Apr 23, 2020

azhavoro commented Apr 26, 2020

nmanovic commented Jun 30, 2020

nmanovic commented Jul 13, 2020

azhavoro left a comment

zhiltsov-max left a comment

nmanovic Jul 16, 2020

Priya4607 Jul 16, 2020

nmanovic Jul 16, 2020

Priya4607 Jul 18, 2020

nmanovic Jul 19, 2020

nmanovic Jul 16, 2020

Priya4607 Jul 16, 2020

nmanovic Jul 17, 2020

nmanovic commented Jul 16, 2020

Priya4607 commented Jul 20, 2020 •

edited

Loading

nmanovic Jul 20, 2020

Priya4607 Jul 20, 2020

nmanovic commented Jul 20, 2020

nmanovic commented Jul 20, 2020

nmanovic Jul 23, 2020

Priya4607 Jul 24, 2020

nmanovic commented Jul 24, 2020

Display of Annotation Type #1192

Display of Annotation Type #1192

Conversation

Priya4607 commented Feb 25, 2020 • edited Loading

nmanovic commented Feb 27, 2020

nmanovic commented Mar 5, 2020

azhavoro left a comment

Choose a reason for hiding this comment

nmanovic left a comment

Choose a reason for hiding this comment

azhavoro commented Mar 19, 2020 • edited Loading

nmanovic commented Apr 8, 2020

Priya4607 commented Apr 9, 2020

Priya4607 commented Apr 23, 2020

azhavoro commented Apr 23, 2020

azhavoro commented Apr 26, 2020

nmanovic commented Jun 30, 2020

nmanovic commented Jul 13, 2020

azhavoro left a comment

Choose a reason for hiding this comment

zhiltsov-max left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nmanovic commented Jul 16, 2020

Priya4607 commented Jul 20, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nmanovic commented Jul 20, 2020

nmanovic commented Jul 20, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nmanovic commented Jul 24, 2020

Priya4607 commented Feb 25, 2020 •

edited

Loading

azhavoro commented Mar 19, 2020 •

edited

Loading

Priya4607 commented Jul 20, 2020 •

edited

Loading