Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
d04da2a3
Commit
d04da2a3
authored
5 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
color parameter is not ignored in gene variants
parent
b5b17383
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!805
Merge 13.1.0 beta.1
,
!801
Resolve "Overlay data columns - review"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG
+1
-0
1 addition, 0 deletions
CHANGELOG
service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
+2
-2
2 additions, 2 deletions
...java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
with
3 additions
and
2 deletions
CHANGELOG
+
1
−
0
View file @
d04da2a3
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
+
2
−
2
View file @
d04da2a3
...
...
@@ -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 v
i
ariants
* list of variants
* @return {@link Color} that should be assigned to
* {@link GeneVariationColorSchema}
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment