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

CVAT.js API Tests #578

Merged
merged 17 commits into from
Jul 19, 2019
Merged

CVAT.js API Tests #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ea8d48d
Added annotations dummy data
bsekachev Jul 17, 2019
8bc4b92
Added test file
bsekachev Jul 17, 2019
75b6e59
Weak maps instead of regular dict
bsekachev Jul 17, 2019
290c3ac
Added 14 API tests
bsekachev Jul 17, 2019
a998b85
Merge branch 'develop' into bs/cvat_tests_js
bsekachev Jul 18, 2019
e95fff8
Fixed put tests
bsekachev Jul 18, 2019
8a9689b
Some written tests and some additional checks
bsekachev Jul 18, 2019
ebcc36e
Merge tests
bsekachev Jul 18, 2019
f2bc421
Split & group tests
bsekachev Jul 18, 2019
7710414
Clear annotations tests
bsekachev Jul 18, 2019
1bd1111
Statistics tests
bsekachev Jul 18, 2019
8e2204a
Added frames meta
bsekachev Jul 18, 2019
0aff7b7
Selection tests & bug fixes
bsekachev Jul 18, 2019
663a324
Tests for frame
bsekachev Jul 19, 2019
de32df8
ObjectState tests, many fixed bugs
bsekachev Jul 19, 2019
688ec53
Object state tests
bsekachev Jul 19, 2019
e562598
Renamed method FrameData.frame() => FrameData.data()
bsekachev Jul 19, 2019
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
55 changes: 43 additions & 12 deletions cvatjs/src/annotations-collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,12 @@
}

class Collection {
constructor(labels) {
this.labels = labels.reduce((labelAccumulator, label) => {
constructor(data) {
this.startFrame = data.startFrame;
this.stopFrame = data.stopFrame;
this.frameMeta = data.frameMeta;

this.labels = data.labels.reduce((labelAccumulator, label) => {
labelAccumulator[label.id] = label;
return labelAccumulator;
}, {});
Expand All @@ -124,6 +128,7 @@
labels: this.labels,
collectionZ: this.collectionZ,
groups: this.groups,
frameMeta: this.frameMeta,
};
}

Expand Down Expand Up @@ -208,14 +213,26 @@
const object = this.objects[state.clientID];
if (typeof (object) === 'undefined') {
throw new window.cvat.exceptions.ArgumentError(
'The object has not been saved yet. Call ObjectState.save() before you can merge it',
'The object has not been saved yet. Call ObjectState.put([state]) before you can merge it',
);
}
return object;
});

const keyframes = {}; // frame: position
const { label, shapeType } = objectStates[0];
if (!(label.id in this.labels)) {
throw new window.cvat.exceptions.ArgumentError(
`Unknown label for the task: ${label.id}`,
);
}

if (!Object.values(window.cvat.enums.ObjectShape).includes(shapeType)) {
throw new window.cvat.exceptions.ArgumentError(
`Got unknown shapeType "${shapeType}"`,
);
}

const labelAttributes = label.attributes.reduce((accumulator, attribute) => {
accumulator[attribute.id] = attribute;
return accumulator;
Expand Down Expand Up @@ -365,7 +382,9 @@
// Remove other shapes
for (const object of objectsForMerge) {
object.removed = true;
object.resetCache();
if (typeof (object.resetCache) === 'function') {
object.resetCache();
}
}
}

Expand All @@ -376,7 +395,7 @@
const object = this.objects[objectState.clientID];
if (typeof (object) === 'undefined') {
throw new window.cvat.exceptions.ArgumentError(
'The object has not been saved yet. Call annotations.put(state) before',
'The object has not been saved yet. Call annotations.put([state]) before',
);
}

Expand All @@ -385,7 +404,7 @@
}

const keyframes = Object.keys(object.shapes).sort((a, b) => +a - +b);
if (frame <= +keyframes[0]) {
if (frame <= +keyframes[0] || frame > keyframes[keyframes.length - 1]) {
return;
}

Expand Down Expand Up @@ -463,7 +482,7 @@
const object = this.objects[state.clientID];
if (typeof (object) === 'undefined') {
throw new window.cvat.exceptions.ArgumentError(
'The object has not been saved yet. Call annotations.put(state) before',
'The object has not been saved yet. Call annotations.put([state]) before',
);
}
return object;
Expand All @@ -472,8 +491,12 @@
const groupIdx = reset ? 0 : ++this.groups.max;
for (const object of objectsForGroup) {
object.group = groupIdx;
object.resetCache();
if (typeof (object.resetCache) === 'function') {
object.resetCache();
}
}

return groupIdx;
}

clear() {
Expand Down Expand Up @@ -526,7 +549,7 @@
} else if (object instanceof Tag) {
objectType = 'tag';
} else {
throw window.cvat.exceptions.ScriptingError(
throw new window.cvat.exceptions.ScriptingError(
`Unexpected object type: "${objectType}"`,
);
}
Expand All @@ -543,6 +566,7 @@
if (objectType === 'track') {
const keyframes = Object.keys(object.shapes)
.sort((a, b) => +a - +b).map(el => +el);

let prevKeyframe = keyframes[0];
let visible = false;

Expand All @@ -560,6 +584,13 @@
labels[label].total++;
}
}

const lastKey = keyframes[keyframes.length - 1];
if (lastKey !== this.stopFrame && !object.shapes[lastKey].outside) {
const interpolated = this.stopFrame - lastKey;
labels[label].interpolated += interpolated;
labels[label].total += interpolated;
}
} else {
labels[label].manually++;
labels[label].total++;
Expand Down Expand Up @@ -648,7 +679,7 @@
frame: state.frame,
group: 0,
label_id: state.label.id,
occluded: state.occluded,
occluded: state.occluded || false,
points: [...state.points],
type: state.shapeType,
z_order: 0,
Expand All @@ -664,7 +695,7 @@
attributes: attributes
.filter(attr => labelAttributes[attr.spec_id].mutable),
frame: state.frame,
occluded: state.occluded,
occluded: state.occluded || false,
outside: false,
points: [...state.points],
type: state.shapeType,
Expand Down Expand Up @@ -698,7 +729,7 @@
const object = this.objects[state.clientID];
if (typeof (object) === 'undefined') {
throw new window.cvat.exceptions.ArgumentError(
'The object has not been saved yet. Call annotations.put(state) before',
'The object has not been saved yet. Call annotations.put([state]) before',
);
}

Expand Down
Loading