From 05c4b06da92879011c952857b014fa6172625cb0 Mon Sep 17 00:00:00 2001 From: Caleb Choo Date: Thu, 29 Nov 2018 14:25:59 -0800 Subject: [PATCH 1/2] #167 Adding support for mouse cytoband values --- mavis/constants.py | 2 ++ mavis/illustrate/constants.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mavis/constants.py b/mavis/constants.py index e91e0aa2..47cf8609 100644 --- a/mavis/constants.py +++ b/mavis/constants.py @@ -652,7 +652,9 @@ def _match_ambiguous_dna(x, y): GIEMSA_STAIN = MavisNamespace( GNEG='gneg', + GPOS33='gpos33', GPOS50='gpos50', + GPOS66='gpos66', GPOS75='gpos75', GPOS25='gpos25', GPOS100='gpos100', diff --git a/mavis/illustrate/constants.py b/mavis/illustrate/constants.py index ee66348d..bba6b764 100644 --- a/mavis/illustrate/constants.py +++ b/mavis/illustrate/constants.py @@ -153,13 +153,15 @@ def __init__( self.legend_border_stroke_width = 1 self.template_band_stroke_width = 0.5 - temp = [c.hex for c in Color('#ffffff').range_to(Color('#000000'), 5)] + temp = [c.hex for c in Color('#ffffff').range_to(Color('#000000'), 7)] self.template_band_fill = { GIEMSA_STAIN.ACEN: '#800000', GIEMSA_STAIN.GPOS25: temp[1], - GIEMSA_STAIN.GPOS50: temp[2], - GIEMSA_STAIN.GPOS75: temp[3], - GIEMSA_STAIN.GPOS100: temp[4], + GIEMSA_STAIN.GPOS33: temp[2], + GIEMSA_STAIN.GPOS50: temp[3], + GIEMSA_STAIN.GPOS66: temp[4], + GIEMSA_STAIN.GPOS75: temp[5], + GIEMSA_STAIN.GPOS100: temp[6], GIEMSA_STAIN.GNEG: '#ffffff' } self.template_band_stroke = '#000000' From 2c8a6b5b318908e92ab02064c81d92196f4f39eb Mon Sep 17 00:00:00 2001 From: Caleb Choo Date: Tue, 4 Dec 2018 13:12:28 -0800 Subject: [PATCH 2/2] bump version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 10c4f76c..145d52b7 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import re -VERSION = '2.1.6' +VERSION = '2.1.7' def parse_md_readme():