From d05e8301511d13fab6751c884135aae2afbb0280 Mon Sep 17 00:00:00 2001 From: "OPTIMUS-PRIME\\craig" Date: Sat, 22 Sep 2018 17:43:01 +0100 Subject: [PATCH] change the column count variable to row count in createHorizontalLines. Apply the applyGrid (async) name change to the CLI and Test Centre. --- DeathSocket/ImageServices.fs | 2 +- DeathSocketCLI/Commands.fs | 4 ++-- TestCentre/LibraryTests.fs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DeathSocket/ImageServices.fs b/DeathSocket/ImageServices.fs index ca5830b..51109e4 100644 --- a/DeathSocket/ImageServices.fs +++ b/DeathSocket/ImageServices.fs @@ -21,7 +21,7 @@ let graphics = Graphics.FromImage img let pen = new Pen (spec.colour, width = spec.penWidth) let horizontalLines = - createHorizontalLines (img.Size.Width) (img.Size.Height) (spec.columns) + createHorizontalLines (img.Size.Width) (img.Size.Height) (spec.rows) let verticalLines = createVerticalLines (img.Size.Width) (img.Size.Height) (spec.columns) for line in horizontalLines do graphics.DrawLines (pen, line) for line in verticalLines do graphics.DrawLines (pen, line) diff --git a/DeathSocketCLI/Commands.fs b/DeathSocketCLI/Commands.fs index aad33ee..40aa03e 100644 --- a/DeathSocketCLI/Commands.fs +++ b/DeathSocketCLI/Commands.fs @@ -38,7 +38,7 @@ try printfn "[INFO.] Adding default grid to image..." buildDefaultSpec imgPath newPath - |> applyGrid + |> applyGridAsync |> Async.RunSynchronously showEndOfCommandMessage with @@ -57,7 +57,7 @@ try printfn "[INFO.] Adding grid to image..." buildSpec imgPath numRows numColumns pWidth colour newPath - |> applyGrid + |> applyGridAsync |> Async.RunSynchronously showEndOfCommandMessage with diff --git a/TestCentre/LibraryTests.fs b/TestCentre/LibraryTests.fs index deaf25a..335dbc2 100644 --- a/TestCentre/LibraryTests.fs +++ b/TestCentre/LibraryTests.fs @@ -85,7 +85,7 @@ penWidth = float32 1 rows = 10 columns = 10 } - applyGrid spec + applyGridAsync spec |> Async.RunSynchronously (File.Exists sPath) = true