Skip to content

Commit

Permalink
Merge 9758357 into 8c6ef18
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-wu committed Apr 28, 2020
2 parents 8c6ef18 + 9758357 commit bf514f9
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 12 deletions.
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "physiomeportal",
"version": "0.4.16",
"version": "0.4.17",
"description": "Physiome Portal",
"main": "build/physiomeportal.js",
"files": [
Expand Down Expand Up @@ -63,6 +63,6 @@
"polyfill-array-includes": "^2.0.0",
"query-string": "^5.1.1",
"webpack-jquery-ui": "^2.0.1",
"zincjs": "^0.33.10"
"zincjs": "^0.33.12"
}
}
19 changes: 19 additions & 0 deletions src/modules/RendererModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,25 @@ RendererModule.prototype.setHighlightedByObjects = function(objects, propagateCh
return changed;
}


RendererModule.prototype.setHighlightedByZincObject = function(
zincObject, propagateChanges) {
if (zincObject && zincObject.isGlyphset) {
var objects = [];
zincObject.forEachGlyph(addGlyphToArray(objects));
var changed = this.graphicsHighlight.setHighlighted(objects);
if (changed && propagateChanges) {
var eventType = require("../utilities/eventNotifier").EVENT_TYPE.SELECTED;
var annotations = this.getAnnotationsFromObjects([objects[0]]);
this.publishChanges(annotations, eventType);
}
return changed;
}
else {
return this.setHighlightedByObjects([zincObject ? zincObject.morph : undefined], propagateChanges);
}
}

RendererModule.prototype.setupLiveCoordinates = function(zincObjects) {
if (zincObjects && (zincObjects.length > 0)) {
var boundingBox = this.scene.getBoundingBoxOfZincObjects(zincObjects);
Expand Down

0 comments on commit bf514f9

Please sign in to comment.