From b67ef899c7a46c154a0fa89d9dda3c1cb2d68872 Mon Sep 17 00:00:00 2001 From: hasufell Date: Sat, 25 Oct 2014 15:44:59 +0200 Subject: [PATCH] DIAGRAM: rm obsolete maybeDiag calls We handle these conditions inside the functions themselves by checking the DiagProp. --- Graphics/Diagram/Gtk.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Graphics/Diagram/Gtk.hs b/Graphics/Diagram/Gtk.hs index 00e07c2..1ffaa76 100644 --- a/Graphics/Diagram/Gtk.hs +++ b/Graphics/Diagram/Gtk.hs @@ -14,25 +14,25 @@ diag :: DiagProp -> Object -> Diagram Cairo R2 diag p obj@(Object _) | alg p == 0 = mkDiag - (mconcat [maybeDiag (ct p) coordPointsText, + (mconcat [coordPointsText, coordPoints, plotterBG]) p obj | alg p == 1 = mkDiag (mconcat - [maybeDiag (ct p) convexHPText, + [convexHPText, convexHP, convexHLs, coordPoints, plotterBG]) p obj | otherwise = mempty diag p objs@(Objects _) | alg p == 2 = - mkDiag (mconcat [polyLines, maybeDiag (ct p) coordPointsText, coordPoints, + mkDiag (mconcat [polyLines, coordPointsText, coordPoints, plotterBG]) p objs | alg p == 3 = - mkDiag (mconcat [maybeDiag (ct p) polyIntersectionText, - polyIntersection, maybeDiag (ct p) coordPointsText, + mkDiag (mconcat [polyIntersectionText, + polyIntersection, coordPointsText, coordPoints, polyLines, plotterBG]) p objs