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.

Sign up for GitHub

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

Incremental save of annotation. #120

Merged
merged 13 commits into from
Oct 15, 2018
Merged

Incremental save of annotation. #120

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
73246ed
improved logic of synchronization with server
Sep 19, 2018
989b7cc
fixed 'save annotation for the task' feature
Sep 20, 2018
4210880
using shapes id generated by cleint instead db to update annotations
Oct 5, 2018
26f6cda
removed md5.js, code cleanup
Oct 5, 2018
a5aefec
fixed update_paths function; code cleanup;
Oct 5, 2018
2f26ac7
fixed import existing tasks without client_id
Oct 5, 2018
75958d0
added some sanity checks for cleint_id; improved annotation parser lo…
Oct 10, 2018
9c8d185
added missed migration
Oct 10, 2018
3954c0f
Merge remote-tracking branch 'origin' into az/anno_synchronization
Oct 10, 2018
7c2cdaa
fixed comments
Oct 10, 2018
83a97a9
changed logic of update shapes method
Oct 11, 2018
a7c74c4
fixed dumping and uploading annotation if annotation task contains in…
Oct 11, 2018
a5bc4d2
preparation for reid
Oct 15, 2018
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: 5 additions & 1 deletion cvat/apps/dashboard/static/dashboard/js/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,15 @@ function uploadAnnotationRequest() {
return;
}

const exportData = createExportContainer();
exportData.create = parsed;
exportData.pre_erase = true;

let asyncSave = function() {
$.ajax({
url: '/save/annotation/task/' + window.cvat.dashboard.taskID,
type: 'POST',
data: JSON.stringify(parsed),
data: JSON.stringify(exportData),
contentType: 'application/json',
success: function() {
let message = 'Annotation successfully uploaded';
Expand Down
490 changes: 403 additions & 87 deletions cvat/apps/engine/annotation.py
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions cvat/apps/engine/migrations/0010_auto_20181002_1122.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Generated by Django 2.0.3 on 2018-10-02 08:22

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('engine', '0009_auto_20180917_1424'),
]

operations = [
migrations.AddField(
model_name='labeledbox',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='labeledpoints',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='labeledpolygon',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='labeledpolyline',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='objectpath',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='trackedbox',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='trackedpoints',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='trackedpolygon',
name='client_id',
field=models.IntegerField(default=-1),
),
migrations.AddField(
model_name='trackedpolyline',
name='client_id',
field=models.IntegerField(default=-1),
),
]
2 changes: 2 additions & 0 deletions cvat/apps/engine/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class Meta:
class Shape(models.Model):
occluded = models.BooleanField(default=False)
z_order = models.IntegerField(default=0)
client_id = models.IntegerField(default=-1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably better add client_id into Annotation class instead of Shape and ObjectPath

class Meta:
abstract = True

Expand Down Expand Up @@ -189,6 +190,7 @@ class LabeledPointsAttributeVal(AttributeVal):

class ObjectPath(Annotation):
id = models.BigAutoField(primary_key=True)
client_id = models.IntegerField(default=-1)
shapes = models.CharField(max_length=10, default='boxes')

class ObjectPathAttributeVal(AttributeVal):
Expand Down
280 changes: 0 additions & 280 deletions cvat/apps/engine/static/engine/js/3rdparty/md5.js
View file
Open in desktop

This file was deleted.

Loading