hasufell/cga
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DIAG: use newtype for DiagAlgo

Browse Source
This commit is contained in:
hasufell 2014-12-17 00:52:07 +01:00
parent d2b51b7ad7
commit c33827b63e
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Graphics/Diagram/Gtk.hs
View File

@ -15,9 +15,9 @@ import Parser.Meshparser
-- |Data structure that holds an algorithm identifier and it's -- |Data structure that holds an algorithm identifier and it's
-- corresponding list of diagrams. -- corresponding list of diagrams.
data DiagAlgo = DiagAlgo { newtype DiagAlgo = DiagAlgo { getDiagAlgo ::
algoNum :: Int, -- the identifier for the algorithm (Int -- the identifier for the algorithm
getDiags :: [Diag] -- the diagrams making up this algorithm , [Diag]) -- the diagrams making up this algorithm
} }
@ -25,30 +25,33 @@ data DiagAlgo = DiagAlgo {
-- coordinate system. -- coordinate system.
diagAlgos :: [DiagAlgo] diagAlgos :: [DiagAlgo]
diagAlgos = diagAlgos =
[DiagAlgo 0 [coordPointsText, coordPoints, plotterBG] [DiagAlgo (0, [coordPointsText, coordPoints, plotterBG])
,DiagAlgo 1 [convexHPText, convexHP, convexHLs, coordPoints, plotterBG] ,DiagAlgo (1, [convexHPText, convexHP, convexHLs, coordPoints, plotterBG])
,DiagAlgo 2 [polyLines, coordPointsText, coordPoints, plotterBG] ,DiagAlgo (2, [polyLines, coordPointsText, coordPoints, plotterBG])
,DiagAlgo 3 [polyIntersectionText, polyIntersection, ,DiagAlgo (3, [polyIntersectionText, polyIntersection,
coordPoints, polyLines, plotterBG] coordPoints, polyLines, plotterBG])
,DiagAlgo 4 [quadPathSquare, squares, coordPointsText, ,DiagAlgo (4, [quadPathSquare, squares, coordPointsText,
coordPoints, plotterBG] coordPoints, plotterBG])
,DiagAlgo 5 [kdRange, kdSquares, coordPointsText, coordPoints, plotterBG]] ,DiagAlgo (5, [kdRange, kdSquares, coordPointsText, coordPoints, plotterBG])]
-- |Introspective data structure holding all algorithms for the -- |Introspective data structure holding all algorithms for the
-- tree view. -- tree view.
diagTreAlgos :: [DiagAlgo] diagTreAlgos :: [DiagAlgo]
diagTreAlgos = diagTreAlgos =
[DiagAlgo 4 [treePretty] [DiagAlgo (4, [treePretty])
,DiagAlgo 5 [kdTreeDiag]] ,DiagAlgo (5, [kdTreeDiag])]
-- |Create the Diagram from the points. -- |Create the Diagram from the points.
diag :: DiagProp -> [DiagAlgo] -> [[PT]] -> Diagram Cairo R2 diag :: DiagProp -> [DiagAlgo] -> [[PT]] -> Diagram Cairo R2
diag p das vts = maybe mempty (\x -> mkDiag x p vts) diag p das vts = maybe mempty (\x -> mkDiag x p vts)
$ mconcat $ mconcat
<$> getDiags -- get the actual [Diag] array
<$> find (\(DiagAlgo x _) -> x == algo p) das <$> (snd . getDiagAlgo)
-- find the correct element from the [DiagAlgo] list
-- which corresponds to the algorithm from DiagProp
<$> find ((==) (algo p) . fst . getDiagAlgo) das
-- |Create the Diagram from a String which is supposed to be the contents -- |Create the Diagram from a String which is supposed to be the contents