BioHMM 1.1.0 → 1.1.1
raw patch · 3 files changed
+27/−21 lines, 3 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- BioHMM.cabal +3/−3
- changelog +2/−0
- src/Bio/HMMDraw.hs +22/−18
BioHMM.cabal view
@@ -1,5 +1,5 @@ name: BioHMM-version: 1.1.0+version: 1.1.1 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.0- tag: 1.1.0+ location: https://github.com/eggzilla/BioHMM/tree/1.1.1+ tag: 1.1.1 library -- Modules exported by the library.
changelog view
@@ -1,4 +1,6 @@ -*-change-log-*-+1.1.1 Florian Eggenhofer <egg@informatik.uni-freiburg.de> 21. April 2017+ * Further improvement for model coloring scheme 1.1.0 Florian Eggenhofer <egg@informatik.uni-freiburg.de> 13. April 2017 * Fixed sampling of colors for multiple models 1.0.9 Florian Eggenhofer <egg@informatik.uni-freiburg.de> 13. April 2017
src/Bio/HMMDraw.hs view
@@ -405,26 +405,30 @@ makeBlankComparisonNodeLabel nodeNumber = (nodeNumber,V.singleton white) makeColorVector :: Int -> V.Vector (Colour Double)-makeColorVector modelNumber = V.map (\(a,b,c) -> R.rgb a b c) modelRGBTupel- where indexVector = V.iterateN modelNumber (1+) 0- stepSize = (765 :: Double) / fromIntegral modelNumber- modelRGBTupel = V.map (makeRGBTupel stepSize) indexVector+makeColorVector modelNumber = V.take modelNumber colorVector+ where colorVector = V.fromList [crimson, 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] -makeRGBTupel :: Double -> Int -> (Double,Double,Double)-makeRGBTupel stepSize modelNumber = (normA,normB,normC)- where totalSize = fromIntegral modelNumber * stepSize- a = rgbBoundries (totalSize - 510)- b = rgbBoundries (totalSize - 255)- c = rgbBoundries totalSize - normA = a/255 - normB = b/255- normC = c/255 +-- makeColorVector :: Int -> V.Vector (Colour Double)+-- makeColorVector modelNumber = V.map (\(a,b,c) -> R.rgb a b c) modelRGBTupel+-- where indexVector = V.iterateN modelNumber (1+) 0+-- stepSize = (765 :: Double) / fromIntegral modelNumber+-- modelRGBTupel = V.map (makeRGBTupel stepSize) indexVector -rgbBoundries :: Double -> Double-rgbBoundries rgbValue- | rgbValue>240 = 240- | rgbValue<10 = 10- | otherwise = rgbValue+-- makeRGBTupel :: Double -> Int -> (Double,Double,Double)+-- makeRGBTupel stepSize modelNumber = (normA,normB,normC)+-- where totalSize = fromIntegral modelNumber * stepSize+-- 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>240 = 240+-- | rgbValue<10 = 10+-- | otherwise = rgbValue text' :: String -> QDiagram Cairo V2 Double Any text' t = textSVG_ (TextOpts linLibertineFont INSIDE_H KERN False 3 3) t # fc black # fillRule EvenOdd # lw 0.0 # translate (r2 (negate 0.75, negate 0.75))