From d3c08d39bca035d0298fd7a9421144597cf2e37e Mon Sep 17 00:00:00 2001 From: Tom Clarke Date: Tue, 12 Sep 2023 20:57:15 +0100 Subject: [PATCH] bump to v4.0.a.14 --- package.json | 2 +- src/Renderer/DrawBlock/SheetUpdateHelpers.fs | 4 ++-- src/Renderer/Interface/FilesIO.fs | 4 +--- src/Renderer/Interface/Version.fs | 2 +- src/Renderer/UI/TopMenuView.fs | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index a36d075e5..2fa3c7c12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "issie", - "version": "4.0.13", + "version": "4.0.14", "description": "Schematic editor and Simulator", "homepage": "https://github.com/tomcl/issie", "bugs": { diff --git a/src/Renderer/DrawBlock/SheetUpdateHelpers.fs b/src/Renderer/DrawBlock/SheetUpdateHelpers.fs index 9ec523002..c653c44c2 100644 --- a/src/Renderer/DrawBlock/SheetUpdateHelpers.fs +++ b/src/Renderer/DrawBlock/SheetUpdateHelpers.fs @@ -637,7 +637,7 @@ let mUpUpdate (model: Model) (mMsg: MouseT) : Model * Cmd = // mM match model.TmpModel with | None -> model | Some newModel -> {newModel with SelectedComponents = model.SelectedComponents} - printfn "mUpUpdate with action: %A" model.Action + //printfn "mUpUpdate with action: %A" model.Action match model.Action with | MovingWire segIdL -> let connIdL = segIdL |> List.map snd @@ -894,4 +894,4 @@ let rec getChannel (bb1:BoundingBox) (bb2:BoundingBox) : (BoundingBox * Orientat else // bb2 above bb1 let y1, y2 = bb1.TopLeft.Y, bb2.TopLeft.Y + bb2.H let topLeft = { X = union.TopLeft.X; Y = bb2.TopLeft.Y + bb2.H } - Some ( { TopLeft = topLeft; H = y1 - y2; W = union.W }, Horizontal ) \ No newline at end of file + Some ( { TopLeft = topLeft; H = y1 - y2; W = union.W }, Horizontal ) diff --git a/src/Renderer/Interface/FilesIO.fs b/src/Renderer/Interface/FilesIO.fs index 7118dd896..360dc1d5a 100644 --- a/src/Renderer/Interface/FilesIO.fs +++ b/src/Renderer/Interface/FilesIO.fs @@ -448,13 +448,11 @@ let readMemLines (addressWidth:int) (wordWidth: int) (lines: string array) = | _ -> failwithf "What? can't happen" let readMemDefns (addressWidth:int) (wordWidth: int) (fPath: string) = - printfn "starting defn read" - tryReadFileSync fPath + tryReadFileSync fPath |> Result.bind ( //(fun contents -> printfn "read file:\n contents={contents}"; contents) String.splitRemoveEmptyEntries [|'\n';'\r'|] >> readMemLines addressWidth wordWidth - >> (fun x -> printfn "read lines"; x) >> Result.map Map.ofArray) diff --git a/src/Renderer/Interface/Version.fs b/src/Renderer/Interface/Version.fs index 6b66c5169..ece528282 100644 --- a/src/Renderer/Interface/Version.fs +++ b/src/Renderer/Interface/Version.fs @@ -1,5 +1,5 @@ module Version -let VERSION = [ "4" ; "0" ; "a"; "13" ] +let VERSION = [ "4" ; "0" ; "a"; "14" ] // The first 12 white-space separated words in this file must be in the above format - note that spaces are required. // This works as valid F# data for displaying the code version and can also be read programmatically from the master branch github file diff --git a/src/Renderer/UI/TopMenuView.fs b/src/Renderer/UI/TopMenuView.fs index 41154a126..8cbd3997b 100644 --- a/src/Renderer/UI/TopMenuView.fs +++ b/src/Renderer/UI/TopMenuView.fs @@ -390,7 +390,7 @@ let loadDemoProject model dispatch basename = |> List.filter isNotDir |> List.iter (fun basename -> let newPath = pathJoin [|newDir; basename|] - log <| printf "haha: %A" (dirName <| dirName newPath) + //log <| printf "haha: %A" (dirName <| dirName newPath) copyFile (pathJoin [|sourceDir; basename|]) newPath) openDemoProjectFromPath newDir model dispatch