Chart 0.10.1 → 0.10.2
raw patch · 3 files changed
+4/−16 lines, 3 files
Files
- Chart.cabal +1/−1
- Graphics/Rendering/Chart/Legend.hs +3/−7
- tests/test.hs +0/−8
Chart.cabal view
@@ -1,5 +1,5 @@ Name: Chart-Version: 0.10.1+Version: 0.10.2 License: BSD3 License-file: LICENSE Copyright: Tim Docker, 2006-2009
Graphics/Rendering/Chart/Legend.hs view
@@ -14,7 +14,6 @@ legend_label_style, legend_margin, legend_plot_size,- legend_vertical ) where import qualified Graphics.Rendering.Cairo as C@@ -33,8 +32,7 @@ data LegendStyle = LegendStyle { legend_label_style_ :: CairoFontStyle, legend_margin_ :: Double,- legend_plot_size_ :: Double,- legend_vertical_ :: Bool+ legend_plot_size_ :: Double } data Legend x y = Legend Bool LegendStyle [Plot x y]@@ -45,8 +43,7 @@ legendToRenderable :: Legend x y -> Renderable String legendToRenderable (Legend _ ls plots) = gridToRenderable grid where- grid = layoutN $ intersperse ggap1 (map (tval.rf) ps)- layoutN = if legend_vertical_ ls then aboveN else besideN+ grid = besideN $ intersperse ggap1 (map (tval.rf) ps) ps :: [(String, [Rect -> CRender ()])] ps = join_nub (concatMap plot_legend_ plots)@@ -74,8 +71,7 @@ defaultLegendStyle = LegendStyle { legend_label_style_=defaultFontStyle, legend_margin_=20,- legend_plot_size_=20,- legend_vertical_=False+ legend_plot_size_=20 } ----------------------------------------------------------------------
tests/test.hs view
@@ -108,13 +108,6 @@ axisBorderOnly = (laxis_visible ^= const True) . (laxis_override ^= (axisGridHide.axisTicksHide.axisLabelsHide)) -test1b :: OutputType -> Renderable ()-test1b otype = toRenderable layout- where- layout = layout1_title ^= "Amplitude Modulation"- $ layout1_legend ^= Just ( legend_vertical ^= True $ defaultLegendStyle)- $ (test1Layout otype)- ---------------------------------------------------------------------- test2 :: [(Int,Int,Int,Double,Double)] -> OutputType -> Renderable () test2 prices otype = toRenderable layout@@ -363,7 +356,6 @@ allTests = [ ("test1", test1) , ("test1a", test1a)- , ("test1b", test1b) , ("test2a", test2 prices) , ("test2b", test2 (filterPrices (date 1 1 2005) (date 31 12 2005))) , ("test2c", test2 (filterPrices (date 1 5 2005) (date 1 7 2005)))