From 096d610e387a18559b7ba0cca1b28299035b8c8a Mon Sep 17 00:00:00 2001 From: Andrey Zhavoronkov Date: Thu, 30 Jan 2020 12:42:19 +0300 Subject: [PATCH] fixed dump of interpolation points object && statistics calculation --- cvat/apps/engine/data_manager.py | 3 ++- cvat/apps/engine/static/engine/js/shapes.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cvat/apps/engine/data_manager.py b/cvat/apps/engine/data_manager.py index 67b5d4410d53..00586ea57e0f 100644 --- a/cvat/apps/engine/data_manager.py +++ b/cvat/apps/engine/data_manager.py @@ -357,7 +357,8 @@ def interpolate(shape0, shape1): prev_shape = shape # TODO: Need to modify a client and a database (append "outside" shapes for polytracks) - if not prev_shape["outside"] and prev_shape["type"] == models.ShapeType.RECTANGLE: + if not prev_shape["outside"] and (prev_shape["type"] == models.ShapeType.RECTANGLE + or prev_shape["type"] == models.ShapeType.POINTS): shape = copy.copy(prev_shape) shape["frame"] = end_frame shapes.extend(interpolate(prev_shape, shape)) diff --git a/cvat/apps/engine/static/engine/js/shapes.js b/cvat/apps/engine/static/engine/js/shapes.js index ddfff6a185be..a95b0306ded6 100644 --- a/cvat/apps/engine/static/engine/js/shapes.js +++ b/cvat/apps/engine/static/engine/js/shapes.js @@ -197,7 +197,8 @@ class ShapeModel extends Listener { } if (visibleFrame != null) { - if (this._type === 'interpolation_box') { + if (this._type === 'interpolation_box' + || this._type === 'interpolation_points') { counter += window.cvat.player.frames.stop - visibleFrame + 1; } else {