mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-19 12:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use V2 types from linear instead of tuples.

Browse Source 
Diagrams has (which I've always found a bad idea) moved
away from the `vector-space` package to `linear`, whose
combinators are all weird, in particular `*^` does not
actually scale vectors but scale-fmap functors. Combined
with the WAT-prone tuple functor, this gives wrong behaviour
when using tuples as vectors.

Well, `V2` is in doubt also more efficient than `(,)`, so...
This commit is contained in:
Justus Sagemüller 2018-03-06 14:06:53 +01:00
parent 7c54a101ca
commit 39b1268e24
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs
View File

@ -58,11 +58,12 @@ diagram = id
withSizeSpec :: SizeSpec V2 Double -> Diagram Cairo -> ManuallySized (Diagram Cairo)
withSizeSpec spec renderable = ManuallySized renderable imgWidth imgHeight
where aspect = width renderable / height renderable
(imgWidth, imgHeight) = case getSpec spec of
V2 (Just w) (Just h) -> (w, h)
V2 (Just w) Nothing -> (w, w/aspect)
V2 Nothing (Just h) -> (aspect*h, h)
V2 Nothing Nothing -> (defaultDiagonal / sqrt (1 + aspect^2)) *^ (aspect, 1)
V2 imgWidth imgHeight = case getSpec spec of
V2 (Just w) (Just h) -> V2 w h
V2 (Just w) Nothing -> V2 w (w/aspect)
V2 Nothing (Just h) -> V2 (aspect*h) h
V2 Nothing Nothing -> (defaultDiagonal / sqrt (1 + aspect^2))
*^ V2 aspect 1
-- w^2 + h^2 = defaultDiagonal^2 / (1+aspect^2)
-- * (aspect^2 + 1)
-- = defaultDiagonal^2