From dcbbcb7d7b9ccd6d9fcd40540b2f023b3fc40760 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Thu, 7 Feb 2019 19:30:59 +0300 Subject: [PATCH] Minor changes. --- cvat/apps/engine/models.py | 5 ++--- cvat/apps/engine/views.py | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py index 5ae6b3b3f3cb..ce660ccedf07 100644 --- a/cvat/apps/engine/models.py +++ b/cvat/apps/engine/models.py @@ -191,6 +191,7 @@ class Meta: class Annotation(models.Model): + id = models.BigAutoField(primary_key=True) job = models.ForeignKey(Job, on_delete=models.CASCADE) label = models.ForeignKey(Label, on_delete=models.CASCADE) frame = models.PositiveIntegerField() @@ -209,7 +210,6 @@ class Meta: default_permissions = () class BoundingBox(Shape): - id = models.BigAutoField(primary_key=True) xtl = models.FloatField() ytl = models.FloatField() xbr = models.FloatField() @@ -220,7 +220,6 @@ class Meta: default_permissions = () class PolyShape(Shape): - id = models.BigAutoField(primary_key=True) points = models.TextField() class Meta: @@ -252,13 +251,13 @@ class LabeledPointsAttributeVal(AttributeVal): points = models.ForeignKey(LabeledPoints, on_delete=models.CASCADE) class ObjectPath(Annotation): - id = models.BigAutoField(primary_key=True) shapes = models.CharField(max_length=10, default='boxes') class ObjectPathAttributeVal(AttributeVal): track = models.ForeignKey(ObjectPath, on_delete=models.CASCADE) class TrackedObject(models.Model): + id = models.BigAutoField(primary_key=True) track = models.ForeignKey(ObjectPath, on_delete=models.CASCADE) frame = models.PositiveIntegerField() outside = models.BooleanField(default=False) diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py index 7a434fe9cdd6..d88a09f0e1e8 100644 --- a/cvat/apps/engine/views.py +++ b/cvat/apps/engine/views.py @@ -115,6 +115,7 @@ def data(self, request, pk): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) + #@action(detail=True, methods=['GET', 'DELETE', 'POST'], serializer_class=None) @action(detail=True, methods=['GET'], serializer_class=None) def annotations(self, request, pk): pass @@ -189,6 +190,7 @@ class JobViewSet(viewsets.GenericViewSet, queryset = Job.objects.all() serializer_class = JobSerializer + #@action(detail=True, methods=['GET', 'DELETE', 'POST'], serializer_class=None) @action(detail=True, methods=['GET'], serializer_class=None) def annotations(self, request, pk): pass