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

Add mouse events to overlay layers #794

Merged
merged 2 commits into from
Mar 15, 2022
Merged

Add mouse events to overlay layers #794

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
437fe8c
Add mouse events to overlay layers
naglepuff Mar 4, 2022
804517b
Add test
naglepuff Mar 11, 2022
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
22 changes: 20 additions & 2 deletions girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,17 @@ var GeojsImageViewerWidgetExtension = function (viewer) {
overlayLayer.id(overlay.id);
overlayLayer.gcs(proj);
this.trigger('g:drawOverlayAnnotation', overlay, overlayLayer);
const featureEvents = geo.event.feature;
overlayLayer.geoOn(
[
featureEvents.mouseclick,
featureEvents.mouseoff,
featureEvents.mouseon,
featureEvents.mouseover,
featureEvents.mouseout
],
(evt) => this._onMouseFeature(evt, annotation.elements().get(overlay.id), overlayLayer)
);
this.viewer.scheduleAnimationFrame(this.viewer.draw, true);
}).fail((response) => {
console.error(`There was an error overlaying image with ID ${overlayItemId}`);
Expand Down Expand Up @@ -632,6 +643,7 @@ var GeojsImageViewerWidgetExtension = function (viewer) {
const overlayLayers = this.viewer.layers().filter(
(layer) => layer.id() === overlay.id);
_.each(overlayLayers, (layer) => {
this.trigger('g:removeOverlayAnnotation', overlay, layer);
this.viewer.deleteLayer(layer);
});
});
Expand Down Expand Up @@ -785,14 +797,13 @@ var GeojsImageViewerWidgetExtension = function (viewer) {
};
},

_onMouseFeature: function (evt) {
_onMouseFeature: function (evt, overlay, overlayLayer) {
var properties = evt.data.properties || {};
var eventType;

if (!this._eventTypes) {
this._setEventTypes();
}

if (properties.element && properties.annotation) {
eventType = this._eventTypes[evt.event];

Expand All @@ -804,6 +815,13 @@ var GeojsImageViewerWidgetExtension = function (viewer) {
evt
);
}
} else if (overlay && overlayLayer) {
// handle events for overlay layers like pixelmaps
eventType = this._eventTypes[evt.event];
if (eventType) {
const overlayEventType = eventType + 'Overlay';
this.trigger(overlayEventType, overlay, overlayLayer, evt);
}
}
}
});
Expand Down
27 changes: 27 additions & 0 deletions girder_annotation/test_annotation/web_client_specs/geojsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,33 @@ $(function () {
});
});

it('fires overlay event', function() {
const eventType = window.geo.event.feature.mouseclick;
const mockEvent = {
event: eventType,
data: {}
};
const mockOverlay = overlayAnnotation.elements().models[0] || {};
const mockLayer = viewer.viewer.createLayer('osm');
var mouseclick = false;
runs(function () {
function handleOverlayEvent() {
mouseclick = true;
}

viewer.on('g:mouseClickAnnotationOverlay', handleOverlayEvent);
viewer._onMouseFeature(mockEvent, mockOverlay, mockLayer);
});

waitsFor(function () {
return mouseclick;
}, 'event to be fired');

runs(function () {
viewer.viewer.deleteLayer(mockLayer);
});
});

it('mouse reset events', function () {
var mousereset, context = {};
runs(function () {
Expand Down