Commit f858e008 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '472-color-of-highlkighted-element' into 'devel_12.0.x'

Resolve "color of highlighted element"

See merge request minerva/core!367
parents d49a963a 12de843c
minerva (12.0.2) stable; urgency=medium
* Bug fix: data overlay by annotation type fixed
* Bug fix: [plugin] getting reactions with set of id larger than 100 elements
works properly
* Bug fix: name of commented protein was remembered for the new comment
* Bug fix: setting zoom level wasn't ranged and validated
* Bug fix: when uploading data overlay there is a warning regarding mixed new
line characters when necessary
* Performance: tomcat inside docker image by default can use 3G of memory
-- Piotr Gawron <piotr.gawron@uni.lu> Tue, 31 Jul 2018 13:00:00 +0200
minerva (12.0.1) stable; urgency=medium
* Bug fix: setting default zoom level on submap
* Bug fix: opened submap had different background then current selection
......
......@@ -75,6 +75,14 @@ AliasSurface.prototype.setColor = function (color) {
}
};
/**
*
* @returns {string}
*/
AliasSurface.prototype.getColor = function () {
return this._color;
};
/**
*
* @param {number} opacity
......@@ -188,7 +196,7 @@ AliasSurface.prototype.init = function () {
if (overlayData !== undefined) {
return functions.overlayToColor(overlayData);
} else {
return "#FF0000";
return self.getColor();
}
}).then(function (color) {
self.addMapCanvasObject(map.getMapCanvas().createRectangle({
......
-- issue #461 - duplicates in reaction ids resolved
update reaction_table r set idreaction=concat(r.idreaction,'_',r.iddb) from (select idreaction, model_iddb from reaction_table group by idreaction, model_iddb having count(*)>1) t where r.idreaction=t.idreaction and r.model_iddb=t.model_iddb;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment