diff --git a/chart-unit.cabal b/chart-unit.cabal
--- a/chart-unit.cabal
+++ b/chart-unit.cabal
@@ -1,5 +1,5 @@
name: chart-unit
-version: 0.5.3
+version: 0.5.4
synopsis:
Native haskell charts.
description:
@@ -61,19 +61,19 @@
-fforce-recomp
build-depends:
base >= 4.7 && < 5,
+ SVGFonts,
colour,
- palette,
+ data-default,
diagrams-lib,
diagrams-svg,
foldl,
formatting,
lens,
linear,
- data-default,
numhask >= 0.0.5 && < 1,
numhask-range >= 0.0.3 && < 1,
- text,
- SVGFonts
+ palette,
+ text
default-language:
Haskell2010
default-extensions:
@@ -111,7 +111,9 @@
chart-unit,
containers,
diagrams-lib,
+ diagrams-svg,
foldl,
+ formatting,
lens,
mwc-probability,
mwc-random,
@@ -119,10 +121,7 @@
primitive,
protolude,
tdigest,
- text,
- diagrams-rasterific,
- diagrams-svg,
- formatting
+ text
default-extensions:
DeriveGeneric,
DeriveTraversable,
diff --git a/examples/sourceExamples.hs b/examples/sourceExamples.hs
--- a/examples/sourceExamples.hs
+++ b/examples/sourceExamples.hs
@@ -13,7 +13,6 @@
import Data.List (zipWith3)
import Diagrams.Prelude hiding ((*.), scaleX, scaleY, (<>))
import FakeData
-import Diagrams.Backend.Rasterific (renderRasterific, Rasterific, animatedGif, GifLooping(..))
import Diagrams.Backend.SVG (B)
import Formatting
@@ -413,7 +412,7 @@
hudRange_ .~ Just (Rect 0 12 0 0.2) $
def)
(lineChart (repeat def))
- (vlineOneD ((0.1*) <$> [0..10]))
+ (vlineOneD ((0.01*) <$> [0..10]))
-- gallery
scatterHistExample :: [[Pair Double]] -> Chart b
@@ -573,8 +572,8 @@
ceptLines :: Renderable (Path V2 Double) b => Aspect -> Rect Double -> (Double -> Double) -> Double -> QDiagram b V2 Double Any
ceptLines (Aspect asp) r@(Ranges rx ry) f x =
- mconcat $ lines (lineColor_ .~ ucolor 0.2 0.2 0.2 1 $ lineSize_ .~ 0.005 $ def) <$>
- (fmap $ Chart.project r asp) <$>
+ mconcat $ lines (lineColor_ .~ ucolor 0.2 0.2 0.2 1 $ lineSize_ .~ 0.005 $ def) .
+ fmap (Chart.project r asp) <$>
[ [Pair (lower rx) (f x), Pair x (f x)]
, [Pair x (lower ry), Pair x (f x)]
]
@@ -601,16 +600,6 @@
xscope = Range -3 3
grain = 50
-animationExample :: FilePath -> IO ()
-animationExample f = do
- let grain = 50
- let xscope = Range 0 -3
- let xs = reverse $ grid OuterPos xscope grain
- let c = ((schoolbookExample :: Double -> QDiagram Rasterific V2 Double Any) <$> xs)
- animatedGif f (mkSizeSpec (Just <$> r2 (400,400))) LoopingNever 10 c
-
--- scratch $ schoolbookExample <> bound def 1 (axis defYAxis one (Range -5 5)) <> bound def 1 (axis defXAxis one (Range -5 5)) <> parabola
-
main :: IO ()
main = do
fileSvg "other/text_Example.svg" (400, 100) text_Example
@@ -674,12 +663,9 @@
fileSvg "other/clippingExample.svg" (600,600) $
exampleClipping (rectColor_ .~ ucolor 0.3 0.3 0.3 0.1 $ def) 1.1 5
lineChart_Example
- putStrLn ("animationExample" :: Text)
- animationExample "other/animationExample.gif"
putStrLn ("schoolbookExample" :: Text)
fileSvg "other/schoolbookExample.svg" (400,400) (schoolbookExample -1)
-- small hud examples
- renderRasterific "other/hud.png" (dims (r2(100,100))) (showOrigin $ hud def :: QDiagram Rasterific V2 Double Any)
fileSvg "other/hud.svg" (100,100) (showOrigin $ hud def)
scaleExample
diff --git a/other/scaleExample.svg b/other/scaleExample.svg
--- a/other/scaleExample.svg
+++ b/other/scaleExample.svg
@@ -1,3 +1,3 @@
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,8 +1,21 @@
-resolver: lts-9.3
+resolver: lts-9.9
+ # nightly-2017-10-18
packages:
- '.'
extra-deps:
+ # nightly versions
- numhask-0.1.2
- numhask-range-0.1.1
+ # lts-9.9 versions
+ - palette-0.1.0.5
+ - SVGFonts-1.6.0.3
+ - diagrams-svg-1.4.1.1
+ - diagrams-lib-1.4.1.2
+ - diagrams-core-1.4.0.1
+ # - diagrams-rasterific-1.4
+ - diagrams-solve-0.1.1
+ - dual-tree-0.2.1
+ - svg-builder-0.1.0.2
+