mirrors/haskell-plot
1
0
Fork 0
mirror of https://github.com/codedownio/haskell-plot.git synced 2025-04-16 11:26:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix extra comma in Simple.hs export list

Browse Source
This commit is contained in:
Vivian McPhail 2012-10-28 18:08:01 +13:00
parent 751a044ada
commit 270c2694c9
10 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -74,4 +74,8 @@
* fixed error bars for non-points
0.1.4.2:
* fixed bug in MinMax with error (logSeriesMinMax)
* fixed bug in MinMax with error (logSeriesMinMax)
0.1.5:
* changed Ticks datatype
* added linlog and loglin to Simple.hs

8
TODO
View File

@ -39,12 +39,8 @@ BUGS
* export Data.Colour.Names
* 0 in log plots should be ignored
* use error series for min/max for ranges
* candle and whisker use bad width for candle part
REFACTOR
* using padding functions not raw data structure: pdFoo, pdBar
@ -84,6 +80,10 @@ COMPLETE
| * getOrdData only returns lower series in MinMax series
| * Candle and Whisker plots use bad sizes (remove xscale/yscale)
| * fix error bars for non-points (esp. bars, hist)
| * 0 in log plots should be ignored
| * candle and whisker use bad width for candle part

4
lib/Graphics/Rendering/Plot/Defaults.hs
View File

@ -160,10 +160,10 @@ majorTickLength = 7.0
tickLabelScale = 0.75
defaultMinorTicks :: Ticks
defaultMinorTicks = Ticks NoLine (Left 41)
defaultMinorTicks = Ticks NoLine (TickNumber 41)
defaultMajorTicks :: Ticks
defaultMajorTicks = Ticks NoLine (Left 5)
defaultMajorTicks = Ticks NoLine (TickNumber 5)
defaultTickFormat :: TickFormat
defaultTickFormat = ""

2
lib/Graphics/Rendering/Plot/Figure.hs
View File

@ -96,7 +96,7 @@ module Graphics.Rendering.Plot.Figure (
, setLegend
, withLegendFormat
-- ** Formatting
, Tick(..), TickValues, GridLines
, Tick(..), TickValues(..), GridLines
, setTicks
, setGridlines
, setTickLabelFormat

2
lib/Graphics/Rendering/Plot/Figure/Plot.hs
View File

@ -65,7 +65,7 @@ module Graphics.Rendering.Plot.Figure.Plot (
, setLegend
, withLegendFormat
-- ** Formatting
, Tick(..), TickValues, GridLines
, Tick(..), TickValues(..), GridLines
, AX.setTicks
, AX.setGridlines
, AX.setTickLabelFormat

2
lib/Graphics/Rendering/Plot/Figure/Plot/Axis.hs
View File

@ -15,7 +15,7 @@
module Graphics.Rendering.Plot.Figure.Plot.Axis (
Axis
, AxisType(..),AxisSide(..),AxisPosn(..)
, Tick(..), TickValues, GridLines
, Tick(..), TickValues(..), GridLines
, setTicks
, setGridlines
, setTickLabelFormat

2
lib/Graphics/Rendering/Plot/Figure/Simple.hs
View File

@ -15,7 +15,7 @@
module Graphics.Rendering.Plot.Figure.Simple (
-- * Plotting
plot
, loglog, semilog, linlog, loglin,
, loglog, semilog, linlog, loglin
, parametric
-- * Formatting
, title

6
lib/Graphics/Rendering/Plot/Render/Plot/Axis.hs
View File

@ -198,8 +198,8 @@ shiftForTicks _ p (Axis _ (Value _) _ _ _ _ _)
= return p
shiftForTicks' :: Padding -> Ticks -> Ticks -> AxisType -> AxisPosn -> TickFormat -> Double -> Render Padding
shiftForTicks' p (Ticks _ (Left 0)) (Ticks _ (Left 0)) _ _ _ _ = return p
shiftForTicks' p (Ticks _ (Left _)) (Ticks _ (Left 0)) _ _ _ _ = return p
shiftForTicks' p (Ticks _ (TickNumber 0)) (Ticks _ (TickNumber 0)) _ _ _ _ = return p
shiftForTicks' p (Ticks _ (TickNumber _)) (Ticks _ (TickNumber 0)) _ _ _ _ = return p
{-
shiftForTicks' (Padding l r b t) (Ticks _ (Left _)) (Ticks _ (Left 0)) XAxis (Side Lower) _ _ = do
bbRaiseBottom minorTickLength
@ -327,7 +327,7 @@ tickPosition min max n = let diff = max - min
-}
renderAxisTicks :: Ranges -> AxisType -> AxisPosn -> Ticks -> Ticks -> TickFormat -> Render ()
renderAxisTicks (Ranges xrange yrange) ax sd
(Ticks gmin (Left tmin)) (Ticks gmaj (Left tmaj)) tf = do
(Ticks gmin (TickNumber tmin)) (Ticks gmaj (TickNumber tmaj)) tf = do
(BoundingBox x y w h) <- get
to <- asks (_textoptions . _renderoptions)
pc <- asks _pangocontext

5
lib/Graphics/Rendering/Plot/Types.hs
View File

@ -182,7 +182,10 @@ data AxisPosn = Side AxisSide
data Tick = Minor | Major deriving(Eq)
type GridLines = Bool
type TickValues = Either Int (Vector Double) -- ^ Either (number of ticks) (tick values)
data TickValues = TickNumber Int
| TickValues (Vector Double)
data Ticks = Ticks LineType TickValues
setTickGridlines :: LineType -> Ticks -> Ticks

2
plot.cabal
View File

@ -1,5 +1,5 @@
Name: plot
Version: 0.1.4.2
Version: 0.1.5
License: BSD3
License-file: LICENSE
Copyright: (c) A.V.H. McPhail 2010, 2012