diff --git a/BioHMM.cabal b/BioHMM.cabal --- a/BioHMM.cabal +++ b/BioHMM.cabal @@ -1,5 +1,5 @@ name: BioHMM -version: 1.0.2 +version: 1.0.3 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 @@ -16,12 +16,12 @@ source-repository head type: git - location: https://github.com/eggzilla/HMM + location: https://github.com/eggzilla/BioHMM source-repository this type: git - location: https://github.com/eggzilla/HMM/tree/1.0.2 - tag: 1.0.2 + location: https://github.com/eggzilla/BioHMM/tree/1.0.3 + tag: 1.0.3 library -- Modules exported by the library. @@ -34,7 +34,7 @@ ghc-options: -Wall -O2 -fno-warn-unused-do-bind -- Other library packages from which modules are imported. - build-depends: base >=4.5 && <5, parsec>=3.1.9, diagrams-lib>=1.4.0.1, text, vector, ParsecTools, diagrams-cairo>=1.4, filepath, colour, directory, either-unwrap, SVGFonts >= 1.6, StockholmAlignment + build-depends: base >=4.5 && <5, parsec>=3.1.9, diagrams-lib>=1.3, text, vector, ParsecTools, diagrams-cairo>=1.3, filepath, colour, directory, either-unwrap, SVGFonts >= 1.6, StockholmAlignment -- Directories containing source files. hs-source-dirs: src diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ -*-change-log-*- +1.0.3 Florian Eggenhofer 29. December 2016 + * Bugfix - reverted broken setting of svgsize 1.0.2 Florian Eggenhofer 29. December 2016 * Added size scaling to HMM drawing functions 1.0.1 Florian Eggenhofer 22. December 2016 diff --git a/src/Bio/HMMDraw.hs b/src/Bio/HMMDraw.hs --- a/src/Bio/HMMDraw.hs +++ b/src/Bio/HMMDraw.hs @@ -98,7 +98,7 @@ nodeNumberPerRow = floor (maxWidth / nodeWidth - 2) nodesIntervals = makeNodeIntervals nodeNumberPerRow nodeNumber verboseNodes = vcat' with { _sep = 3 } (V.toList (V.map (drawDetailedNodeRow alphabetSymbols emissiontype boxlength nodeNumber currentNodes comparisonNodeLabels) nodesIntervals)) - verboseNodesAlignment = alignTL (vcat' with { _sep = 5 } [modelHeader,verboseNodes,alignmentDiagram]) + verboseNodesAlignment = (alignTL (vcat' with { _sep = 5 } [modelHeader,verboseNodes,alignmentDiagram])) modelHeader = makeModelHeader (HM.name model) modelColor alignmentDiagram = if isJust aln then drawStockholmLines entriesNumberCutoff maxWidth nodeAlignmentColIndices comparisonNodeLabels (fromJust aln) else mempty --connectedNodes = makeConnections boxlength currentNodes @@ -325,7 +325,7 @@ bar emission = (rect (4 * emission) 1 # lw 0 # fc black # translate (r2 (negate (2 - (4 * emission/2)),0)) <> rect 4 1 # lw 0.03 ) svgsize :: SizeSpec V2 Double -svgsize = mkSizeSpec2D (Just 2) (Just 2) +svgsize = mkSizeSpec2D Nothing Nothing -- | Check for available cairo output formats diagramName :: String -> String -> Either String String