From d04da2a3437fca7550c12678f5a280677225c4eb Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 7 Jun 2019 14:41:35 +0200
Subject: [PATCH] color parameter is not ignored in gene variants
---
CHANGELOG | 1 +
.../java/lcsb/mapviewer/services/utils/ColorSchemaReader.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 8ffa5ce732..8b544c0a48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ minerva (12.3.1~beta.1) unstable; urgency=low
* Bug fix: when changing data in edit user dialog there was a need to click
close button twice (#818)
* Bug fix: empty type for data overlay is allowed (#827)
+ * Bug fix: genetic variants data overlay was ignoring color parameter (#827)
minerva (13.1.0~beta.0) unstable; urgency=low
* Feature: annotators are more flexible - you can define set of input and
diff --git a/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java b/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
index fb49f55ff8..2471473e53 100644
--- a/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
+++ b/service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
@@ -435,7 +435,7 @@ public class ColorSchemaReader {
}
}
for (ColorSchema colorSchema : schemasByName.values()) {
- if (colorSchema instanceof GeneVariationColorSchema) {
+ if (colorSchema instanceof GeneVariationColorSchema && colorSchema.getColor() == null) {
colorSchema.setColor(getGeneVariantsColor(((GeneVariationColorSchema) colorSchema).getGeneVariations()));
}
}
@@ -446,7 +446,7 @@ public class ColorSchemaReader {
* Gets color that should be assigned to {@link GeneVariationColorSchema}.
*
* @param geneVariations
- * list of viariants
+ * list of variants
* @return {@link Color} that should be assigned to
* {@link GeneVariationColorSchema}
*/
--
GitLab