diff --git a/DeathSocket/GridPainter.fs b/DeathSocket/GridPainter.fs index 205ba7f..af1d235 100644 --- a/DeathSocket/GridPainter.fs +++ b/DeathSocket/GridPainter.fs @@ -81,8 +81,11 @@ namespace DeathSocket let scaleLineThickness (previewDimension: double) (actualDimension: double) (lineThickness: double) = lineThickness / (previewDimension / actualDimension) - // NOT TESTED. - let determineDimension imageType = + /// + /// + /// + /// + let determineImageDimensions imageType = match imageType with | SkiaSharp s -> validateIO s |> ignore diff --git a/DeathSocket/ScratchPad.fsx b/DeathSocket/ScratchPad.fsx index d14be3c..444f05f 100644 --- a/DeathSocket/ScratchPad.fsx +++ b/DeathSocket/ScratchPad.fsx @@ -1,7 +1,7 @@ -// These two paths need adjusting to match your computer. +// These paths need adjusting to match your computer. #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/lib/netstandard1.3/SkiaSharp.dll" // Currently not working... -// #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll" +// #r @"C:/Users/craig/.nuget/packages/skiasharp/1.68.0/runtimes/win-x64/native/libSkiaSharp.dll" #load "Domain.fs" #load "Validation.fs" @@ -41,15 +41,30 @@ let skVerticalLines = createSKVerticalLines 120 450 22 (* You will need to provide the image and specify its load/save location. Death Socket assumes either JPEG or PNG files.*) -// Not working at time of writing see "#r" comment (lines 3 and 4) +// Internal function call. Not accessible outside this project. let skiaSharpDimensions = determineSkiaDimensions (desktop + "/test.jpg") +// Internal function call. Not accessible outside this project. let systemDrawingDimensions = determineSystemDrawingDimensions (desktop + "/test.jpg") -let width = double (fst systemDrawingDimensions) // skiaSharpDimensions -let height = double (snd systemDrawingDimensions) // skiaSharpDimensions +// Internal function calls. Not accessible outside this project. +let width = double (fst skiaSharpDimensions) +let width2 = double (fst systemDrawingDimensions) + +// Internal function calls. Not accessible outside this project. +let height = double (snd skiaSharpDimensions) +let height2 = double (snd systemDrawingDimensions) + +// Public function for the internal ones above. +let dimensions = + //SkiaSharp (desktop + "/test.jpg") + SystemDrawing (desktop + "/test.jpg") + |> GridPainter.determineImageDimensions + +let width3 = fst dimensions +let height3 = snd dimensions // Change the line thickness (the last parameter) to whatever you want. let scaledPen = GridPainter.scaleLineThickness width height 8.0