add grey scale functionality to RGBASpec image type.

The code can now convert the image into grey scale and add a grid on top of it when using the RGBASpec. The commands in the console program can now pass on the grey scale variable to. The Skia Sharp functions still need this functionality added it.

DeathSocket/GridPainter.fs

@@ -50,10 +50,10 @@ namespace DeathSocket
                         | false -> drawRGBAGrid r
                     | Skia s ->
                         validateIO s.originalPath s.savePath |> ignore
-                        drawSkiaGrid s // greyScale
+                        drawSkiaGrid s // greyScale not implemented
                     | SkiaRGB sR ->
                         validateIO sR.originalPath sR.savePath |> ignore
-                        drawSkiaRGBGrid sR // greyScale
+                        drawSkiaRGBGrid sR // greyScale not implemented
                     | _ -> printfn "[DEATH SOCKET INFO] Inappropriate ImageSpec used here. Please use none buffer-based spec's when using this function."
                 with
                 | :? FileNotFoundException as ex ->

DeathSocket/ImageServices.fs

@@ -255,12 +255,30 @@
         clone.Save (spec.savePath)
 
     let drawRGBAGridGrey (spec: RGBASpec) =
-        // THIS NEEDS REFACTORING TO CONVERT IMAGE TO GREYSCALE.
+        // This part converts the images to greyscale.
         use original = Bitmap.FromFile spec.originalPath
         use temp = new Bitmap (original)
-        use clone =
-            temp.Clone (new Rectangle(0, 0, temp.Width, temp.Height), PixelFormat.Format32bppArgb)
+        use clone = new Bitmap(temp.Width, temp.Height)
+        use g = Graphics.FromImage(clone)
+
+        // This can be refactored out into its own function or reachable from 
+        // anywhere in this module. It's used more than once and doesn't use 'use'.
+        let aM: float32[][] = [|
+            [| (float32 0.3);  (float32 0.3);  (float32 0.3);  (float32 0.0); (float32 0.0)    |];
+            [| (float32 0.59); (float32 0.59); (float32 0.59); (float32 0.0); (float32 0.0)    |];
+            [| (float32 0.11); (float32 0.11); (float32 0.11); (float32 0.0); (float32 0.0)    |];
+            [| (float32 0.0);  (float32 0.0);  (float32 0.0);  (float32 1.0); (float32 0.0)    |];
+            [| (float32 0.0);  (float32 0.0);  (float32 0.0);  (float32 0.0); (float32 1.0)    |];
+        |]
+
+        let colourMatrix = new ColorMatrix(aM) // Maybe put in own function?
+        use attributes = new ImageAttributes()
+        attributes.SetColorMatrix(colourMatrix)
+        g.DrawImage(temp, new Rectangle(0, 0, temp.Width, temp.Height),
+                    0, 0, temp.Width, temp.Height, GraphicsUnit.Pixel, attributes)
         use graphics = Graphics.FromImage(clone)
+
+        // This part applies the grid.
         use pen = new Pen ((makeBrushFromRGBASpec spec), width = spec.penWidth)
         graphics.DrawImage (original,new Rectangle(0, 0, clone.Width, clone.Height))
         let horizontalLines =

DeathSocketCLI/Commands.fs

@@ -51,10 +51,10 @@
         [<ListCommand>]
         [<Parameters
             ("(image-path: string) (no-of-rows: int) (no-of-columns: int) " +
-             "(pen-width: float32) (colour: string) (new-path: string)")>]
+             "(pen-width: float32) (colour: string) (new-path: string) (greyScale: bool)")>]
         [<Description "Adds a grid to an image, using the specified parameters, and saves it.">]
         [<Usage
-            "add-grid C:/orignal-image.png 10 5 2 red C:/new-image.png">]
+            "add-grid C:/orignal-image.png 10 5 2 red C:/new-image.png true">]
         let ``add-grid`` imgPath numRows numColumns pWidth colour newPath greyScale =
             try
                 printfn "[INFO.] Adding grid to image..."
@@ -112,13 +112,13 @@
         let``add-skia-grid`` imgPath numRows numColumns pWidth colour newPath greyScale=
             printfn "[INFO.] Adding SkiaSharp grid to image..."
             Skia (buildSkiaSpec imgPath numRows numColumns pWidth colour newPath)
-            |> applyGridToImageAsync greyScale
+            |> applyGridToImageAsync greyScale // Not implement in this context.
             |> Async.Start
             showEndOfCommandMessage
 
         let``add-skia-rgb-grid`` imgPath numRows numColumns pWidth r g b newPath greyScale =
             printfn "[INFO.] Adding SkiaSharp grid to image..."
             SkiaRGB (buildSkiaRGBSpec imgPath numRows numColumns pWidth r g b newPath)
-            |> applyGridToImageAsync greyScale
+            |> applyGridToImageAsync greyScale // Not implement in this context.
             |> Async.Start
             showEndOfCommandMessage