diff --git a/BioHMM.cabal b/BioHMM.cabal --- a/BioHMM.cabal +++ b/BioHMM.cabal @@ -1,5 +1,5 @@ name: BioHMM -version: 1.0.9 +version: 1.1.0 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.0.9 - tag: 1.0.9 + location: https://github.com/eggzilla/BioHMM/tree/1.1.0 + tag: 1.1.0 library -- Modules exported by the library. diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ -*-change-log-*- +1.1.0 Florian Eggenhofer 13. April 2017 + * Fixed sampling of colors for multiple models 1.0.9 Florian Eggenhofer 13. April 2017 * Improved handling of missing stockholm input 1.0.8 Florian Eggenhofer 7. April 2017 diff --git a/src/Bio/HMMDraw.hs b/src/Bio/HMMDraw.hs --- a/src/Bio/HMMDraw.hs +++ b/src/Bio/HMMDraw.hs @@ -411,16 +411,19 @@ modelRGBTupel = V.map (makeRGBTupel stepSize) indexVector makeRGBTupel :: Double -> Int -> (Double,Double,Double) -makeRGBTupel stepSize modelNumber = (a,b,c) +makeRGBTupel stepSize modelNumber = (normA,normB,normC) where totalSize = fromIntegral modelNumber * stepSize - a = rgbBoundries (totalSize - 255)/255 - b = rgbBoundries (totalSize - a - 255)/255 - c = rgbBoundries (totalSize - a - b)/255 + a = rgbBoundries (totalSize - 510) + b = rgbBoundries (totalSize - 255) + c = rgbBoundries totalSize + normA = a/255 + normB = b/255 + normC = c/255 rgbBoundries :: Double -> Double rgbBoundries rgbValue - | rgbValue>210 = 210 - | rgbValue<50 = 50 + | rgbValue>240 = 240 + | rgbValue<10 = 10 | otherwise = rgbValue text' :: String -> QDiagram Cairo V2 Double Any