minor refactor

Author: clayrat

chart-tests/tests/Test15.hs

@@ -1,4 +1,4 @@
-module Test15 where 
+module Test15 where
 
 import Graphics.Rendering.Chart
 import Data.Colour
@@ -10,14 +10,14 @@ import Utils
 
 chart lo lp = layoutToRenderable layout
  where
-  layout = 
+  layout =
         layout_title .~ "Legend Test"
       $ layout_title_style . font_size .~ 10
       $ layout_x_axis . laxis_generate .~ autoIndexAxis alabels
       $ layout_y_axis . laxis_override .~ axisGridHide
       $ layout_left_axis_visibility . axis_show_ticks .~ False
       $ layout_plots .~ [ plotBars bars2 ]
-      $ layout_legend .~ Just lstyle
+      $ layout_legend ?~ lstyle
       $ def :: Layout PlotIndex Double
 
   bars2 = plot_bars_titles .~ ["A","B","C","D","E","F","G","H","I","J"]

chart/Graphics/Rendering/Chart/Easy.hs

@@ -1,12 +1,12 @@
-{-# LANGUAGE ScopedTypeVariables, TemplateHaskell, TypeSynonymInstances, FlexibleInstances #-}
+{-# LANGUAGE ScopedTypeVariables, FlexibleInstances #-}
 ----------------------------------------------------------------------------
 -- |
 -- Module      :  Graphics.Rendering.Chart.Easy
 -- Copyright   :  (c) Tim Docker 2014
 -- License     :  BSD-style (see chart/COPYRIGHT)
 --
 -- A high level API for generating a plot quickly.
--- 
+--
 -- Importing the Easy module brings into scope all core functions and types required
 -- for working with the chart library. This includes key external dependencies such as
 -- Control.Lens and Data.Colour. The module also provides several helper functions for
@@ -17,10 +17,10 @@
 --
 -- > import Graphics.Rendering.Chart.Easy
 -- > import Graphics.Rendering.Chart.Backend.Cairo
--- > 
+-- >
 -- > signal :: [Double] -> [(Double,Double)]
 -- > signal xs = [ (x,(sin (x*3.14159/45) + 1) / 2 * (sin (x*3.14159/5))) | x <- xs ]
--- > 
+-- >
 -- > main = toFile def "example.png" $ do
 -- >     layout_title .= "Amplitude Modulation"
 -- >     plot (line "am" [signal [0,(0.5)..400]])
@@ -46,7 +46,7 @@ module Graphics.Rendering.Chart.Easy(
   ) where
 
 import Control.Lens
-import Control.Monad(when)
+import Control.Monad(unless)
 import Data.Default.Class
 import Data.Colour hiding (over) -- overlaps with lens over function
 import Data.Colour.Names
@@ -83,19 +83,19 @@ points title values = liftEC $ do
     plot_points_style . point_color .= color
     plot_points_style . point_shape .= shape
     plot_points_style . point_radius .= 2
-    
+
     -- Show borders for unfilled shapes
-    when (not (isFilled shape)) $ do
+    unless (isFilled shape) $ do
         plot_points_style . point_border_color .= color
         plot_points_style . point_border_width .= 1
 
 isFilled :: PointShape -> Bool
 isFilled PointShapeCircle = True
 isFilled PointShapePolygon{} = True
 isFilled _ = False
-    
+
 -- | Construct a bar chart with the given titles and data, using the
--- next available colors    
+-- next available colors
 bars :: (PlotValue x, BarsPlotValue y) => [String] -> [(x,[y])] -> EC l (PlotBars x y)
 bars titles vals = liftEC $ do
     styles <- sequence [fmap mkStyle takeColor | _ <- titles]