Skip to content

scaledAxis' allowing to define single axis endpoint #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjornbm wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −12
Open

scaledAxis' allowing to define single axis endpoint #162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6277517
Whitespace cleanup (courtesy of Atom).
bjornbm May 23, 2017
e350f6f
scaledAxis' accepting Maybe bounds.
bjornbm May 23, 2017
24a00cf
Define autoScaledAxis in terms of scaledAxis'.
bjornbm May 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions chart/Graphics/Rendering/Chart/Axis/Floating.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module Graphics.Rendering.Chart.Axis.Floating(
LogValue(..),
LogAxisParams(..),
scaledAxis,
scaledAxis',
autoScaledAxis,
autoScaledLogAxis,
autoSteps,
Expand All @@ -31,6 +32,7 @@ module Graphics.Rendering.Chart.Axis.Floating(
) where

import Data.List(minimumBy)
import Data.Maybe (fromMaybe)
import Data.Ord (comparing)
import Data.Default.Class
import Numeric (showEFloat, showFFloat)
Expand Down Expand Up @@ -186,7 +188,7 @@ data LinearAxisParams a = LinearAxisParams {
}

instance (Show a, RealFloat a) => Default (LinearAxisParams a) where
def = LinearAxisParams
def = LinearAxisParams
{ _la_labelf = showDs
, _la_nLabels = 5
, _la_nTicks = 50
Expand All @@ -208,13 +210,18 @@ scaledAxis lap rs@(minV,maxV) ps0 = makeAxis' realToFrac realToFrac
gridvs = labelvs
r = range ps

-- | Generate a linear axis with the optionally specified bounds.
-- Unspecified bounds are computed automatically.
scaledAxis' :: RealFloat a => LinearAxisParams a -> (Maybe a, Maybe a) -> AxisFn a
scaledAxis' lap (minV,maxV) ps0 = scaledAxis lap rs ps
where
ps = filter isValidNumber ps0
rs = (fromMaybe (minimum ps) minV, fromMaybe (maximum ps) maxV)

-- | Generate a linear axis automatically, scaled appropriately for the
-- input data.
autoScaledAxis :: RealFloat a => LinearAxisParams a -> AxisFn a
autoScaledAxis lap ps0 = scaledAxis lap rs ps
where
ps = filter isValidNumber ps0
rs = (minimum ps,maximum ps)
autoScaledAxis lap = scaledAxis' lap (Nothing, Nothing)

steps :: RealFloat a => a -> (a,a) -> [Rational]
steps nSteps rs@(minV,maxV) = map ((s*) . fromIntegral) [min' .. max']
Expand Down Expand Up @@ -249,7 +256,7 @@ autoSteps nSteps vs = map fromRational $ steps (fromIntegral nSteps) r
----------------------------------------------------------------------

instance (Show a, RealFloat a) => Default (LogAxisParams a) where
def = LogAxisParams
def = LogAxisParams
{ _loga_labelf = showDs
}

Expand Down Expand Up @@ -299,17 +306,17 @@ logTicks (low,high) = (major,minor,major)
maximum (1:filter (\x -> log10 (fromRational x) <= r) l)*10^^i
upper a l = let (i,r) = pf (log10 a) in
minimum (10:filter (\x -> r <= log10 (fromRational x)) l)*10^^i

powers :: (Double,Double) -> [Rational] -> [Rational]
powers (x,y) l = [ a*10^^p | p <- [(floor (log10 x))..(ceiling (log10 y))] :: [Integer]
, a <- l ]
midselection r l = filter (inRange r l) (powers r l)
inRange (a,b) l x = (lower a l <= x) && (x <= upper b l)

logRange = (log10 low, log10 high)

roundPow x = 10^^(round x :: Integer)

major | 17.5 < log10 ratio = map roundPow $
steps (min 5 (log10 ratio)) logRange
| 12 < log10 ratio = map roundPow $
Expand All @@ -326,8 +333,8 @@ logTicks (low,high) = (major,minor,major)
(dl',dh') = (fromRational l', fromRational h')
ratio' :: Double
ratio' = fromRational (h'/l')
filterX = filter (\x -> l'<=x && x <=h') . powers (dl',dh')
filterX = filter (\x -> l'<=x && x <=h') . powers (dl',dh')

minor | 50 < log10 ratio' = map roundPow $
steps 50 (log10 dl', log10 dh')
| 6 < log10 ratio' = filterX [1,10]
Expand Down