Chart 1.9 → 1.9.1

raw patch · 4 files changed

+12/−9 lines, 4 filesdep ~lensPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: lens

API changes (from Hackage documentation)

Files

• Chart.cabal +2/−2
• Graphics/Rendering/Chart/Axis/Time.hs +4/−4
• Graphics/Rendering/Chart/Easy.hs +1/−1
• Graphics/Rendering/Chart/State.hs +5/−2

@@ -1,5 +1,5 @@ Name: Chart-Version: 1.9+Version: 1.9.1 License: BSD3 License-file: LICENSE Copyright: Tim Docker, 2006-2014@@ -21,7 +21,7 @@   Build-depends: base >= 3 && < 5                , old-locale                , time, mtl, array-               , lens >= 3.9 && < 4.17+               , lens >= 3.9 && < 4.18                , colour >= 2.2.1 && < 2.4                , data-default-class < 0.2                , mtl >= 2.0 && < 2.3

@@ -161,8 +161,8 @@   -> AxisFn t timeValueAxis tseq lseq labelf lal cseq contextf clal pts = AxisData {     _axis_visibility = def,-    _axis_viewport = vmap' (min', max'),-    _axis_tropweiv = invmap' (min', max'),+    _axis_viewport = vmap' (tvFromUTCTime min', tvFromUTCTime max'),+    _axis_tropweiv = invmap' (tvFromUTCTime min', tvFromUTCTime max'),     _axis_ticks    = [ (tvFromUTCTime t,2) | t <- times] ++ [ (tvFromUTCTime t,5) | t <- ltimes, visible t],     _axis_labels   = [ [ (tvFromUTCTime t,l) | (t,l) <- labels labelf   ltimes lal, visible t]                      , [ (tvFromUTCTime t,l) | (t,l) <- labels contextf ctimes clal, visible t]@@ -196,11 +196,11 @@       m1' = doubleFromTimeValue m1       m2' = doubleFromTimeValue m2 -vmap' :: TimeValue x => (UTCTime,UTCTime) -> Range -> x -> Double+vmap' :: TimeValue x => (x,x) -> Range -> x -> Double vmap' (v1,v2) (v3,v4) v = v3 + (doubleFromTimeValue v - doubleFromTimeValue v1) * (v4-v3)                               / (doubleFromTimeValue v2 - doubleFromTimeValue v1) -invmap' :: TimeValue x => (UTCTime,UTCTime) -> Range -> Double -> x+invmap' :: TimeValue x => (x,x) -> Range -> Double -> x invmap' (v3,v4) (d1,d2) d = timeValueFromDouble (doubleFromTimeValue v3 + ( (d-d1) * doubleRange                                                    / (d2-d1) ))     where doubleRange = doubleFromTimeValue v4 - doubleFromTimeValue v3

@@ -9,7 +9,7 @@ --  -- Importing the Easy module brings into scope all core functions and types required -- for working with the chart library. This includes key external dependencies such as--- Control.Len and Data.Colour. The module also provides several helper functions for+-- Control.Lens and Data.Colour. The module also provides several helper functions for -- quickly generating common plots. Note that chart backends must still be explicitly -- imported, as some backends cannot be built on all platforms. --

@@ -92,14 +92,17 @@ -- | Pop and return the next color from the state takeColor :: EC l (AlphaColour Double) takeColor = liftCState $ do-  (c:cs) <- use colors+  (c,cs) <- fromInfiniteList `fmap` use colors   colors .= cs   return c  -- | Pop and return the next shape from the state takeShape :: EC l PointShape takeShape = liftCState $ do-  (c:cs) <- use shapes+  (c,cs) <- fromInfiniteList `fmap` use shapes   shapes .= cs   return c +fromInfiniteList :: [a] -> (a, [a])+fromInfiniteList []     = error "fromInfiniteList (takeColor or takeShape): empty list"+fromInfiniteList (x:xs) = (x, xs)