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

Fixes from release 0.2 #99

Merged
merged 2 commits into from
Sep 28, 2018
Merged

Fixes from release 0.2 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dcb271
Bug has been fixed: impossible to lock/occlude object in AAM
Sep 28, 2018
fda56d7
Bug has been fixed: invisible points actually are visible
Sep 28, 2018
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
16 changes: 8 additions & 8 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 @@ -897,19 +897,19 @@ class ShapeCollectionController {
}

switchActiveOccluded() {
if (!window.cvat.mode) {
if (!window.cvat.mode || window.cvat.mode === 'aam') {
this._model.switchActiveOccluded();
}
}

switchAllLock() {
if (!window.cvat.mode) {
if (!window.cvat.mode || window.cvat.mode === 'aam') {
this._model.switchAllLock();
}
}

switchActiveLock() {
if (!window.cvat.mode) {
if (!window.cvat.mode || window.cvat.mode === 'aam') {
this._model.switchActiveLock();
}
}
Expand Down Expand Up @@ -1289,17 +1289,17 @@ class ShapeCollectionView {
static sortByZOrder() {
if (window.cvat.job.z_order) {
let content = $('#frameContent');
let shapes = content.find('.shape, .pointTempGroup, .shapeCreation, .aim').toArray().sort(
let shapes = $(content.find('.shape, .pointTempGroup, .shapeCreation, .aim').toArray().sort(
(a,b) => (+a.attributes.z_order.nodeValue - +b.attributes.z_order.nodeValue)
);
));
let children = content.children().not(shapes);

for (let shape of shapes) {
content.append(shape);
}

let texts = content.find('.shapeText');
for (let text of texts) {
content.append(text);
for (let child of children) {
content.append(child);
}
}
}
Expand Down
8 changes: 5 additions & 3 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 @@ -3081,9 +3081,11 @@ class PointsView extends PolyShapeView {

_makeNotEditable() {
PolyShapeView.prototype._makeNotEditable.call(this);
let interpolation = this._controller.interpolate(window.cvat.player.frames.current);
if (interpolation.position.points) {
this._drawPointMarkers(interpolation.position);
if (!this._controller.hiddenShape) {
let interpolation = this._controller.interpolate(window.cvat.player.frames.current);
if (interpolation.position.points) {
this._drawPointMarkers(interpolation.position);
}
}
}

Expand Down