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

Incremental collection update now works with outside/keyframe (Critical) #114

Merged
merged 1 commit into from
Oct 4, 2018
Merged

Incremental collection update now works with outside/keyframe (Critical) #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions cvat/apps/engine/static/engine/js/shapeCollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,16 +1233,17 @@ class ShapeCollectionView {
// Check which old models are new models
for (let oldIdx = 0; oldIdx < oldModels.length; oldIdx ++) {
let newIdx = newModels.indexOf(oldModels[oldIdx]);
let significantUpdate = ['remove', 'keyframe', 'outside'].includes(oldModels[oldIdx].updateReason);

// Changed frame means a changed position in common case. We need redraw it.
// If shape has been restored after removing, it view already removed. We need redraw it.
if (newIdx === -1 || frameChanged || oldModels[oldIdx].updateReason === 'remove') {
if (newIdx === -1 || significantUpdate || frameChanged) {
let view = oldViews[oldIdx];
view.unsubscribe(this);
view.controller().model().unsubscribe(view);
view.erase();

if (newIdx != -1 && (frameChanged || oldModels[oldIdx].updateReason === 'remove')) {
if (newIdx != -1 && (frameChanged || significantUpdate)) {
drawView.call(this, newShapes[newIdx], newModels[newIdx])
}
}
Expand All @@ -1255,7 +1256,7 @@ class ShapeCollectionView {

// Now we need draw new models which aren't on previous collection
for (let newIdx = 0; newIdx < newModels.length; newIdx ++) {
if (!oldModels.includes(newModels[newIdx])) {
if (!this._currentModels.includes(newModels[newIdx])) {
drawView.call(this, newShapes[newIdx], newModels[newIdx])
}
}
Expand Down
88 changes: 40 additions & 48 deletions cvat/apps/engine/static/engine/js/shapes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,17 @@ class ShapeModel extends Listener {
return counter;
}

notify(updateReason) {
let oldReason = this._updateReason;
this._updateReason = updateReason;
try {
Listener.prototype.notify.call(this);
}
finally {
this._updateReason = oldReason;
}
}

collectStatistic() {
let collectObj = {};
collectObj.type = this._type.split('_')[1];
Expand Down Expand Up @@ -229,8 +240,7 @@ class ShapeModel extends Listener {
window.cvat.addAction('Change Attribute', () => {
if (typeof(oldAttr) === 'undefined') {
delete this._attributes.mutable[frame][attrId];
this._updateReason = 'attributes';
this.notify();
this.notify('attributes');
}
else {
this.updateAttribute(frame, attrId, oldAttr);
Expand All @@ -249,8 +259,7 @@ class ShapeModel extends Listener {
this._attributes.immutable[attrId] = labelsInfo.strToValues(attrInfo.type, value)[0];
}

this._updateReason = 'attributes';
this.notify();
this.notify('attributes');
}

changeLabel(labelId) {
Expand All @@ -263,8 +272,7 @@ class ShapeModel extends Listener {
this._label = +labelId;
this._importAttributes([], []);
this._setupKeyFrames();
this._updateReason = 'changelabel';
this.notify();
this.notify('attributes');
}
else {
throw Error(`Unknown label id value found: ${labelId}`);
Expand All @@ -273,8 +281,7 @@ class ShapeModel extends Listener {

changeColor(color) {
this._color = color;
this._updateReason = 'color';
this.notify();
this.notify('color');
}

interpolate(frame) {
Expand All @@ -297,14 +304,12 @@ class ShapeModel extends Listener {
// End of undo/redo code

this.updatePosition(frame, position, true);
this._updateReason = 'occluded';
this.notify();
this.notify('occluded');
}

switchLock() {
this._locked = !this._locked;
this._updateReason = 'lock';
this.notify();
this.notify('lock');
}

switchHide() {
Expand All @@ -321,8 +326,7 @@ class ShapeModel extends Listener {
this._hiddenText = false;
}

this._updateReason = 'hidden';
this.notify();
this.notify('hidden');
}

switchOutside(frame) {
Expand All @@ -346,8 +350,7 @@ class ShapeModel extends Listener {
delete this._attributes.mutable[frame];
}

this._updateReason = 'outside';
this.notify();
this.notify('outside');
}
else {
this.switchOutside(frame);
Expand All @@ -370,8 +373,7 @@ class ShapeModel extends Listener {
this._frame = frame;
}

this._updateReason = 'outside';
this.notify();
this.notify('outside');
}

switchKeyFrame(frame) {
Expand All @@ -381,8 +383,12 @@ class ShapeModel extends Listener {
}

// Undo/redo code
let oldPos = Object.assign({}, this._positions[frame]);
window.cvat.addAction('Change Keyframe', () => {
this.switchKeyFrame(frame);
if (Object.keys(oldPos).length && oldPos.outside) {
this.switchOutside(frame);
}
}, () => {
this.switchKeyFrame(frame);
}, frame);
Expand Down Expand Up @@ -411,13 +417,12 @@ class ShapeModel extends Listener {
this._frame = frame;
}
}
this._updateReason = 'keyframe';
this.notify();

this.notify('keyframe');
}

click() {
this._updateReason = 'click';
this.notify();
this.notify('click');
}

prevKeyFrame() {
Expand All @@ -437,23 +442,20 @@ class ShapeModel extends Listener {
}

aamAttributeFocus() {
this._updateReason = 'attributeFocus';
this.notify();
this.notify('attributeFocus');
}

select() {
if (!this._selected) {
this._selected = true;
this._updateReason = 'selection';
this.notify();
this.notify('selection');
}
}

deselect() {
if (this._selected) {
this._selected = false;
this._updateReason = 'selection';
this.notify();
this.notify('selection');
}
}

Expand All @@ -480,8 +482,7 @@ class ShapeModel extends Listener {
let position = this._interpolatePosition(frame);
position.z_order = value;
this.updatePosition(frame, position, true);
this._updateReason = 'z_order';
this.notify();
this.notify('z_order');
}
}

Expand All @@ -490,8 +491,7 @@ class ShapeModel extends Listener {
this._active = false;
}
this._removed = value;
this._updateReason = 'remove';
this.notify();
this.notify('remove');
}

get removed() {
Expand All @@ -513,8 +513,7 @@ class ShapeModel extends Listener {
set active(value) {
this._active = value;
if (!this._removed) {
this._updateReason = 'activation';
this.notify();
this.notify('activation');
}
}

Expand All @@ -525,8 +524,7 @@ class ShapeModel extends Listener {
set activeAAM(active) {
this._activeAAM = active.shape;
this._activeAAMAttributeId = active.attribute;
this._updateReason = 'activeAAM';
this.notify();
this.notify('activeAAM');
}

get activeAAM() {
Expand All @@ -538,8 +536,7 @@ class ShapeModel extends Listener {

set merge(value) {
this._merge = value;
this._updateReason = 'merge';
this.notify();
this.notify('merge');
}

get merge() {
Expand All @@ -548,8 +545,7 @@ class ShapeModel extends Listener {

set groupping(value) {
this._groupping = value;
this._updateReason = 'groupping';
this.notify();
this.notify('groupping');
}

get groupping() {
Expand Down Expand Up @@ -683,8 +679,7 @@ class BoxModel extends ShapeModel {
window.cvat.addAction('Change Position', () => {
if (!Object.keys(oldPos).length) {
delete this._positions[frame];
this._updateReason = 'position';
this.notify();
this.notify('position');
}
else {
this.updatePosition(frame, oldPos, false);
Expand All @@ -706,8 +701,7 @@ class BoxModel extends ShapeModel {
}

if (!silent) {
this._updateReason = 'position';
this.notify();
this.notify('position');
}
}

Expand Down Expand Up @@ -933,8 +927,7 @@ class PolyShapeModel extends ShapeModel {
}

if (!silent) {
this._updateReason = 'position';
this.notify();
this.notify('position');
}
}

Expand Down Expand Up @@ -1209,8 +1202,7 @@ class PolygonModel extends PolyShapeModel {

set draggable(value) {
this._draggable = value;
this._updateReason = 'draggable';
this.notify();
this.notify('draggable');
}

get draggable() {
Expand Down