Sort shapes by frame (#417)

cvat-ai · Apr 22, 2019 · 2cedb8b · 2cedb8b
1 parent fd22511
commit 2cedb8b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cvat/apps/engine/annotation.py b/cvat/apps/engine/annotation.py
@@ -448,7 +448,8 @@ def _init_tags_from_db(self):
             'labeledimageattributeval__spec_id',
             'labeledimageattributeval__value',
             'labeledimageattributeval__id',
-        )
+        ).order_by('frame')
+
         db_tags = _merge_table_rows(
             rows=db_tags,
             keys_for_merge={
@@ -479,7 +480,7 @@ def _init_shapes_from_db(self):
             'labeledshapeattributeval__spec_id',
             'labeledshapeattributeval__value',
             'labeledshapeattributeval__id',
-            )
+            ).order_by('frame')
 
         db_shapes = _merge_table_rows(
             rows=db_shapes,
@@ -519,7 +520,7 @@ def _init_tracks_from_db(self):
             "trackedshape__trackedshapeattributeval__spec_id",
             "trackedshape__trackedshapeattributeval__value",
             "trackedshape__trackedshapeattributeval__id",
-        )
+        ).order_by('id', 'trackedshape__frame')
 
         db_tracks = _merge_table_rows(
             rows=db_tracks,