hs-gchart 0.4.1 → 0.4.2

raw patch · 9 files changed

+34/−33 lines, 9 filesnew-uploaderPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGELOG.md +3/−0
• Graphics/GChart.hs +0/−1
• Graphics/GChart/ChartItems.hs +1/−1
• Graphics/GChart/ChartItems/Colors.hs +0/−2
• Graphics/GChart/Types.hs +0/−1
• LICENSE +1/−1
• README.md +16/−14
• examples/Examples.hs +0/−1
• hs-gchart.cabal +13/−12

@@ -0,0 +1,3 @@+## 0.4.2++* Brought up-to-date with recent GHCs

@@ -379,4 +379,3 @@ convertToUrl chart = baseURL ++ intercalate "&" urlparams where     baseURL = "http://chart.apis.google.com/chart?"     urlparams = [urlEnc a ++ "=" ++ urlEnc b | (a,b) <- getParams chart]-

@@ -1,4 +1,5 @@ {-# LANGUAGE NoMonomorphismRestriction #-}+{-# LANGUAGE FlexibleContexts #-} module Graphics.GChart.ChartItems (   getChartDataFromChartM,   addDataToChart,@@ -103,4 +104,3 @@                                                  encodeMaybe $ chartLineStyles chart,                                                  encodeMaybe $ qrEncoding chart,                                                  encodeMaybe $ chartLabelData chart]-

@@ -37,5 +37,3 @@                                                     Background  -> "bg"                                                     Area        -> "c"                                                     Transparent -> "a"--

@@ -617,4 +617,3 @@  -- | Default chart label data for QR Encoding defaultQREncodingLabelData = QRLabelData L' 4-

@@ -1,4 +1,4 @@-Copyright (c) 2010 Deepak Jois <deepak.jois@gmail.com>+Copyright (c) 2010-2020 Deepak Jois <deepak.jois@gmail.com> All rights reserved.  Redistribution and use in source and binary forms, with or without

@@ -1,3 +1,5 @@+[![Hackage version](https://img.shields.io/hackage/v/hs-gchart.svg?label=Hackage)](https://hackage.haskell.org/package/hs-gchart)[![Linux build status](https://img.shields.io/travis/tomjaguarpaw/hs-gchart/master.svg?label=Linux%20build)](https://travis-ci.org/tomjaguarpaw/hs-gchart)+ ## Introduction   **GChart** is a Haskell wrapper around [Google Chart API].@@ -105,10 +107,10 @@                          addAxis $ makeAxis { axisType = AxisBottom,                                               axisLabels = Just $ ["Dec 1st"] ++ blanks 4 ++ ["6th"] ++ blanks 18 ++ ["25th","26th"] ++ blanks 4 ++ ["Dec 31st"] }                          addChartDataXY dataSeries2-    +     dataSeries2 :: [(Float,Float)]     dataSeries2 = [(0,0),(100,100)]-    +     blanks x = take x $ repeat ""  Generates the following chart@@ -119,33 +121,33 @@  The code below -    linexyGraph2 = +    linexyGraph2 =         getChartUrl $ do setChartSize 800 300                          setChartType LineXY                          setDataEncoding text                          setChartTitle "Projected Christmas Cheer for 2007"-     +                          setGrid $ makeGrid { xAxisStep = 3.333,                                               yAxisStep = 10,                                               lineSegmentLength = Just 1,                                               blankSegmentLength = Just 3 }-     +                          addAxis $ makeAxis { axisType = AxisLeft,                                               axisRange = Just $ Range (0,100) (Just 50) }                          addAxis $ makeAxis { axisType = AxisBottom,                                               axisLabels = Just $ ["Dec 1st"] ++ blanks 4 ++ ["6th"] ++ blanks 18 ++ ["25th","26th"] ++ blanks 4 ++ ["Dec 31st"] }-     +                          addChartDataXY dataSeries3                          addColor "458B00"-     +                          addChartDataXY dataSeries4                          addColor "CD2626"-     +                          setLegend $ legendWithPosition ["2006","2007"] LegendRight-     +     dataSeries3 :: [(Float,Float)]     dataSeries3 = zip [0,16.7,23.3,33.3,60,76.7,83.3,86.7,93.3,96.7,100] [30,45,20,50,15,80,60,70,40,55,80]-     +     dataSeries4 :: [(Float,Float)]     dataSeries4 = zip [0,10,16.7,26.7,33.3] [50,10,30,55,60] @@ -157,7 +159,7 @@  ### Example 5 : Scatter Plot with Shape Markers -The code below +The code below      scatterPlotWithMarkers = getChartUrl $ do setChartSize 200 125                                               setChartType ScatterPlot@@ -168,17 +170,17 @@                                               addAxis $ makeAxis { axisType = AxisLeft,                                                                    axisLabels = Just $ blanks 1 ++ ["50","100"] }                                               setGrid $ makeGrid { xAxisStep = 20, yAxisStep = 25 }-     +                                               addShapeMarker $ makeShapeMarker { shapeType  = ShapeSquare                                                                                , shapeColor = "ff0000"                                                                                , shapeSize  = 10 }-     +     -- Reverse engineering sample data from webpage     dataSeries5 :: [(Int,Int)]     dataSeries5 = zip xseries yseries where                  xseries = map encSimpleReverse "984sttvuvkQIBLKNCAIipr3z9"                  yseries = map encSimpleReverse "DEJPgq0uov17_zwopQOD"-     +     encSimpleReverse :: Char -> Int     encSimpleReverse c | ord c >= ord 'A' && ord c <= ord 'Z' = (ord c - ord 'A')                        | ord c >= ord 'a' && ord c <= ord 'z' = 26 + (ord c - ord 'a')

@@ -217,4 +217,3 @@           putStrLn lineChartWithLineStyles           putStrLn formulaChart           putStrLn qrCodeChart-

@@ -1,35 +1,39 @@ name: hs-gchart-version: 0.4.1+version: 0.4.2 synopsis: Haskell wrapper for the Google Chart API description:     This module is a wrapper around the Google Chart API. It exposes a rich     set of Haskell data types to specify your chart data, which can then be     converted into a URL that generates the PNG image of the chart. +    This package is very old and not really supported. license: BSD3 license-file: LICENSE author: Deepak Jois-maintainer: deepak.jois@gmail.com-copyright: (c) 2010 Deepak Jois <deepak.jois@gmail.com>+maintainer: Tom Ellis+copyright: (c) 2010-2020 Deepak Jois <deepak.jois@gmail.com> build-type: Simple-cabal-version: >= 1.6+cabal-version: >= 1.18 category: Graphics-stability: experimental homepage: http://github.com/deepakjois/hs-gchart data-files: README.md extra-source-files: examples/Examples.hs-tested-with: GHC==6.12.1+extra-doc-files: README.md CHANGELOG.md+tested-with: GHC==8.10.1, GHC==8.8.3, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2+bug-reports: https://github.com/tomjaguarpaw/hs-gchart/issues  source-repository head   type:     git-  location: git://github.com/deepakjois/hs-gchart.git+  location: https://github.com/tomjaguarpaw/hs-gchart.git  library-  build-depends: +  default-language: Haskell2010++  build-depends:      base >= 4 && < 5     ,mtl -  exposed-modules: +  exposed-modules:      Graphics.GChart     ,Graphics.GChart.Types @@ -42,6 +46,3 @@     ,Graphics.GChart.ChartItems.Styles     ,Graphics.GChart.ChartItems.Util     ,Graphics.GChart.DataEncoding---