diff --git a/BioHMM.cabal b/BioHMM.cabal --- a/BioHMM.cabal +++ b/BioHMM.cabal @@ -1,5 +1,5 @@ name: BioHMM -version: 1.1.4 +version: 1.1.5 synopsis: Libary for Hidden Markov Models in HMMER3 format. description: Libary containing parsing and visualisation functions and datastructures for Hidden Markov Models in HMMER3 format. license: GPL-3 @@ -20,8 +20,8 @@ source-repository this type: git - location: https://github.com/eggzilla/BioHMM/tree/1.1.4 - tag: 1.1.4 + location: https://github.com/eggzilla/BioHMM/tree/1.1.5 + tag: 1.1.5 library -- Modules exported by the library. diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ -*-change-log-*- +1.1.5 Florian Eggenhofer 23. May 2017 + * Fixed normalization of newly added colors 1.1.4 Florian Eggenhofer 22. May 2017 * Color scheme is now more robust for grayscale-printing 1.1.3 Florian Eggenhofer 9. May 2017 diff --git a/src/Bio/HMMDraw.hs b/src/Bio/HMMDraw.hs --- a/src/Bio/HMMDraw.hs +++ b/src/Bio/HMMDraw.hs @@ -426,7 +426,7 @@ makeColorVector :: Int -> V.Vector (Colour Double) makeColorVector modelNumber = V.take modelNumber colorVector - where colorVector = V.fromList [R.rgb 166 206 227, R.rgb 31 120 180, R.rgb 178 223 138, R.rgb 51 160 44, R.rgb 251 154 153, R.rgb 227 26 28, R.rgb 253 191 111, R.rgb 255 127 0, R.rgb 202 178 214, R.rgb 106 61 154, R.rgb 255 255 153, R.rgb 177 89 40, moccasin, lime, seagreen, aqua ,darkorange ,blue, blueviolet ,brown ,burlywood ,cadetblue ,chartreuse ,chocolate ,coral ,cornflowerblue ,cornsilk ,cyan ,darkblue ,darkcyan ,darkgoldenrod ,darkgray ,darkgreen ,darkgrey ,darkkhaki ,darkmagenta ,darkolivegreen ,darkorchid ,darkred ,darksalmon ,darkseagreen ,darkslateblue ,darkslategray ,darkslategrey ,darkturquoise ,darkviolet ,deeppink ,deepskyblue ,dimgray ,dimgrey ,dodgerblue ,firebrick ,forestgreen ,fuchsia ,gainsboro ,gold ,goldenrod ,gray ,grey ,green ,greenyellow ,honeydew ,hotpink ,indianred,indigo ,ivory ,khaki ,lavender ,lavenderblush ,lawngreen ,lemonchiffon ,lime ,limegreen ,linen ,magenta ,maroon ,mediumaquamarine ,mediumblue ,mediumorchid ,mediumpurple ,mediumseagreen ,mediumslateblue ,mediumspringgreen ,mediumturquoise ,mediumvioletred ,midnightblue ,mintcream ,mistyrose ,navy ,oldlace ,olive ,olivedrab ,orange ,orangered ,orchid ,papayawhip ,peachpuff ,peru ,pink ,plum ,powderblue ,purple ,red ,rosybrown ,royalblue ,saddlebrown ,salmon ,sandybrown ,seagreen] + where colorVector = V.fromList [R.rgb 0.650980392 0.807843137 0.890196078, R.rgb 0.121568627 0.470588235 0.705882353, R.rgb 0.698039216 0.874509804 0.541176471, R.rgb 0.2 0.62745098 0.17254902, R.rgb 0.984313725 0.603921569 0.6, R.rgb 0.890196078 0.101960784 0.109803922, R.rgb 0.992156863 0.749019608 0.435294118, R.rgb 1 0.498039216 0, R.rgb 0.792156863 0.698039216 0.839215686, R.rgb 0.415686275 0.239215686 0.603921569, R.rgb 1 1 0.6, R.rgb 0.694117647 0.349019608 0.156862745, moccasin, lime, seagreen, aqua ,darkorange ,blue, blueviolet ,brown ,burlywood ,cadetblue ,chartreuse ,chocolate ,coral ,cornflowerblue ,cornsilk ,cyan ,darkblue ,darkcyan ,darkgoldenrod ,darkgray ,darkgreen ,darkgrey ,darkkhaki ,darkmagenta ,darkolivegreen ,darkorchid ,darkred ,darksalmon ,darkseagreen ,darkslateblue ,darkslategray ,darkslategrey ,darkturquoise ,darkviolet ,deeppink ,deepskyblue ,dimgray ,dimgrey ,dodgerblue ,firebrick ,forestgreen ,fuchsia ,gainsboro ,gold ,goldenrod ,gray ,grey ,green ,greenyellow ,honeydew ,hotpink ,indianred,indigo ,ivory ,khaki ,lavender ,lavenderblush ,lawngreen ,lemonchiffon ,lime ,limegreen ,linen ,magenta ,maroon ,mediumaquamarine ,mediumblue ,mediumorchid ,mediumpurple ,mediumseagreen ,mediumslateblue ,mediumspringgreen ,mediumturquoise ,mediumvioletred ,midnightblue ,mintcream ,mistyrose ,navy ,oldlace ,olive ,olivedrab ,orange ,orangered ,orchid ,papayawhip ,peachpuff ,peru ,pink ,plum ,powderblue ,purple ,red ,rosybrown ,royalblue ,saddlebrown ,salmon ,sandybrown ,seagreen] --makeColorVector :: Int -> V.Vector (Colour Double) --makeColorVector modelNumber = V.map (\(a,b,c) -> R.rgb a b c) modelRGBTupel