Fixed calculating statistics in case with removed frames

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TDB
 
 ### Fixed
+- Calculating number of objects on annotation view when frames are deleted
+ (<https://github.com/opencv/cvat/pull/6493>)
 - \[SDK\] Ability to create attributes with blank default values
   (<https://github.com/opencv/cvat/pull/6454>)
 - \[SDK\] SDK should not change input data in models (<https://github.com/opencv/cvat/pull/6455>)

cvat-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-core",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "src/api.ts",
   "scripts": {

cvat-core/src/annotations-collection.ts

@@ -659,18 +659,32 @@ export default class Collection {
         fillBody(Object.values(this.labels).filter((label) => !label.hasParent));
 
         const scanTrack = (track, prefix = ''): void => {
+            const countInterpolatedFrames = (start: number, stop: number, lastIsKeyframe: boolean): number => {
+                let count = stop - start;
+                if (lastIsKeyframe) {
+                    count -= 1;
+                }
+                for (let i = start + 1; lastIsKeyframe ? i < stop : i <= stop; i++) {
+                    if (this.frameMeta.deleted_frames[i]) {
+                        count--;
+                    }
+                }
+                return count;
+            };
+
             const pref = prefix ? `${prefix}${sep}` : '';
             const label = `${pref}${track.label.name}`;
             labels[label][track.shapeType].track++;
             const keyframes = Object.keys(track.shapes)
                 .sort((a, b) => +a - +b)
-                .map((el) => +el);
+                .map((el) => +el)
+                .filter((frame) => !this.frameMeta.deleted_frames[frame]);
 
             let prevKeyframe = keyframes[0];
             let visible = false;
             for (const keyframe of keyframes) {
                 if (visible) {
-                    const interpolated = keyframe - prevKeyframe - 1;
+                    const interpolated = countInterpolatedFrames(prevKeyframe, keyframe, true);
                     labels[label].interpolated += interpolated;
                     labels[label].total += interpolated;
                 }
@@ -692,7 +706,7 @@ export default class Collection {
             }
 
             if (lastKey !== this.stopFrame && !track.get(lastKey).outside) {
-                const interpolated = this.stopFrame - lastKey;
+                const interpolated = countInterpolatedFrames(lastKey, this.stopFrame, false);
                 labels[label].interpolated += interpolated;
                 labels[label].total += interpolated;
             }
@@ -719,13 +733,13 @@ export default class Collection {
             }
 
             const { name: label } = object.label;
-            if (objectType === 'tag') {
+            if (objectType === 'tag' && !this.frameMeta.deleted_frames[object.frame]) {
                 labels[label].tag++;
                 labels[label].manually++;
                 labels[label].total++;
             } else if (objectType === 'track') {
                 scanTrack(object);
-            } else {
+            } else if (!this.frameMeta.deleted_frames[object.frame]) {
                 const { shapeType } = object as Shape;
                 labels[label][shapeType].shape++;
                 labels[label].manually++;

cvat-core/tests/api/annotations.js

@@ -872,7 +872,29 @@ describe('Feature: get statistics', () => {
         expect(statistics.label[labelName].manually).toBe(2);
         expect(statistics.label[labelName].interpolated).toBe(3);
         expect(statistics.label[labelName].total).toBe(5);
+    });
 
+    test('get statistics from a job with skeletons', async () => {
+        const job = (await window.cvat.jobs.get({ jobID: 102 }))[0];
+        await job.annotations.clear(true);
+        let statistics = await job.annotations.statistics();
+        expect(statistics.total.manually).toBe(5);
+        expect(statistics.total.interpolated).toBe(443);
+        expect(statistics.total.tag).toBe(1);
+        expect(statistics.total.rectangle.shape).toBe(1);
+        expect(statistics.total.rectangle.track).toBe(1);
+        await job.frames.delete(500); // track frame
+        await job.frames.delete(510); // rectangle shape frame
+        await job.frames.delete(550); // the first keyframe of a track
+        statistics = await job.annotations.statistics();
+        expect(statistics.total.manually).toBe(2);
+        expect(statistics.total.tag).toBe(0);
+        expect(statistics.total.rectangle.shape).toBe(0);
+        expect(statistics.total.interpolated).toBe(394);
+        await job.frames.delete(650); // intermediate frame in a track
+        statistics = await job.annotations.statistics();
+        expect(statistics.total.interpolated).toBe(393);
+        await job.close();
     });
 });