Make Gif animation more nice, TODO: IMPROVE CODE

Graphics/Diagram/Gif.hs

@@ -18,11 +18,16 @@ gifDiag p xs =
     fmap (\x -> x <> nonChDiag)              .
     flip (++)
       [mkDiag (convexHullPointsText `mappend`
-                convexHullLines     `mappend`
                 convexHullPoints)
-              p xs]                $
-    (convexHullLinesInterval p xs)
+              p xs <> lastUpperHull <> lastLowerHull] $
+    (lowerHullList ++
+      ((<> lastLowerHull) <$>
+      upperHullList))
   where
+    upperHullList = convexHullLinesIntervalUpper p xs
+    lastUpperHull = last upperHullList
+    lowerHullList = convexHullLinesIntervalLower p xs
+    lastLowerHull = last lowerHullList
     -- add the x-axis and the other default stuff
     nonChDiag =
       mconcat                      .

Graphics/Diagram/Plotter.hs

@@ -85,19 +85,30 @@ convexHullLines = Diag chl
         vtf = filter (inRange (dX p) (dY p)) vt
 
 
--- |Same as showConvexHullLines, except that it returns an array
--- of diagrams with each step of the algorithm.
--- Unfortunately this is very difficult to implement as a Diag (TODO).
-convexHullLinesInterval :: DiagProp -> [PT] -> [Diagram Cairo R2]
-convexHullLinesInterval p xs =
-  fmap mkChDiag (grahamGetCHSteps xs)
+convexHullLinesIntervalLower :: DiagProp -> [PT] -> [Diagram Cairo R2]
+convexHullLinesIntervalLower p xs =
+  fmap mkChDiag (grahamGetLowerHullSteps xs)
   where
     mkChDiag vt =
       (strokeTrail         .
           fromVertices     $
           vtf)            #
         moveTo (head vtf) #
-        lc red
+        lc orange
+      where
+        vtf = filter (inRange (dX p) (dY p)) vt
+
+
+convexHullLinesIntervalUpper :: DiagProp -> [PT] -> [Diagram Cairo R2]
+convexHullLinesIntervalUpper p xs =
+  fmap mkChDiag (grahamGetUpperHullSteps xs)
+  where
+    mkChDiag vt =
+      (strokeTrail         .
+          fromVertices     $
+          vtf)            #
+        moveTo (head vtf) #
+        lc purple
       where
         vtf = filter (inRange (dX p) (dY p)) vt